bzip2/lzma: fix decompress_inflate.c vs multi-block-with-embedded-filename

Impact: Bug fix

Fix gunzip uncompression, so that it also works with files with
embedded filenames that are larger than one block.

Signed-off-by: Alain Knaff <alain@knaff.lu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c
index d2e7c758d1ca1df8c1025133612fa4f74575d108..839a329b4fc43e5d6e40ce912fdfe3ed6bfc4834 100644 (file)
--- a/lib/decompress_inflate.c
+++ b/lib/decompress_inflate.c
@@ -97,7 +97,7 @@ STATIC int INIT gunzip(unsigned char *buf, int len,
                        strm->next_in++;
                strm->next_in++;
        }
-       strm->avail_in = len - 10;
+       strm->avail_in = len - (strm->next_in - zbuf);
 
        strm->next_out = out_buf;
        strm->avail_out = out_len;