From 38288bbf4cb26be1d1b3ee9175666d6819892a9e Mon Sep 17 00:00:00 2001 From: Glenn L McGrath Date: Thu, 29 Nov 2001 06:36:56 +0000 Subject: [PATCH] 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. --- archival/libunarchive/decompress_unzip.c | 8 ++++++++ archival/libunarchive/unzip.c | 8 ++++++++ libbb/unzip.c | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index bb32891be..69cc8198b 100644 --- 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 bb32891be..69cc8198b 100644 --- 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 bb32891be..69cc8198b 100644 --- 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();