[tip:core/percpu] bzip2/lzma: fix decompress_inflate.c vs multi-block-with-embedded-filename

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  6c11b12ac6f101732d43b5682f5b3ae4dda4205f
Gitweb:     http://git.kernel.org/tip/6c11b12ac6f101732d43b5682f5b3ae4dda4205f
Author:     "Alain Knaff" <alain@xxxxxxxx>
AuthorDate: Thu, 8 Jan 2009 15:10:19 -0800
Commit:     H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Thu, 8 Jan 2009 15:10:19 -0800

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@xxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>


---
 lib/decompress_inflate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c
index d2e7c75..839a329 100644
--- 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux