commit 5519352661a948f91232b52ec2146c398020dbbe
author Eugene Kliuchnikov <eustas.ru@gmail.com> Thu Jul 02 17:57:40 2020 +0200
committer GitHub <noreply@github.com> Thu Jul 02 17:57:40 2020 +0200
tree bbcc776e55407fb283a5812571c0dcf355ec69fb
parent d2ea198232916f6894f4f36ea47458c6e56bc4e0

Add workaround for lying feof. (#814)

Should fix #812

c/tools/brotli.c

diff --git a/c/tools/brotli.c b/c/tools/brotli.c
index 04606a8..3db34f2 100644
--- a/c/tools/brotli.c
+++ b/c/tools/brotli.c
@@ -803,6 +803,8 @@
   context->total_out = 0;
 }
 
+/* This method might give the false-negative result.
+   However, after an empty / incomplete read it should tell the truth. */
 static BROTLI_BOOL HasMoreInput(Context* context) {
   return feof(context->fin) ? BROTLI_FALSE : BROTLI_TRUE;
 }
@@ -883,7 +885,9 @@
       if (!ProvideOutput(context)) return BROTLI_FALSE;
     } else if (result == BROTLI_DECODER_RESULT_SUCCESS) {
       if (!FlushOutput(context)) return BROTLI_FALSE;
-      if (context->available_in != 0 || HasMoreInput(context)) {
+      int has_more_input =
+          (context->available_in != 0) || (fgetc(context->fin) != EOF);
+      if (has_more_input) {
         fprintf(stderr, "corrupt input [%s]\n",
                 PrintablePath(context->current_input_path));
         return BROTLI_FALSE;