gunzip was incorrectly reporting a failed crc and length (discovered by

Chang, Shu-Hao).  The bitbuffer needs to be unwound after decompression,
as it was eating into the crc/size field.

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index bb32891be46fec30d8c6315f5615a615dfad0961..69cc8198ba1bfa303c76763df11c513ea10fb1f2 100644 (file)
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -875,6 +875,14 @@ static int inflate(void)
                }
        } while (!e);
 
+       /* Undo too much lookahead. The next read will be byte aligned so we
+        * can discard unused bits in the last meaningful byte.
+        */
+       while (bk >= 8) {
+               bk -= 8;
+               ungetc((bb << bk), in_file);
+       }
+
        /* flush out window */
        flush_window();
 

diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c
index bb32891be46fec30d8c6315f5615a615dfad0961..69cc8198ba1bfa303c76763df11c513ea10fb1f2 100644 (file)
--- a/archival/libunarchive/unzip.c
+++ b/archival/libunarchive/unzip.c
@@ -875,6 +875,14 @@ static int inflate(void)
                }
        } while (!e);
 
+       /* Undo too much lookahead. The next read will be byte aligned so we
+        * can discard unused bits in the last meaningful byte.
+        */
+       while (bk >= 8) {
+               bk -= 8;
+               ungetc((bb << bk), in_file);
+       }
+
        /* flush out window */
        flush_window();
 

diff --git a/libbb/unzip.c b/libbb/unzip.c
index bb32891be46fec30d8c6315f5615a615dfad0961..69cc8198ba1bfa303c76763df11c513ea10fb1f2 100644 (file)
--- a/libbb/unzip.c
+++ b/libbb/unzip.c
@@ -875,6 +875,14 @@ static int inflate(void)
                }
        } while (!e);
 
+       /* Undo too much lookahead. The next read will be byte aligned so we
+        * can discard unused bits in the last meaningful byte.
+        */
+       while (bk >= 8) {
+               bk -= 8;
+               ungetc((bb << bk), in_file);
+       }
+
        /* flush out window */
        flush_window();