Decompressors: Check input size in decompress_inflate.c
PATCH 1/1 Decompressors: Check input size in decompress_inflate.c
From: Lasse Collin <[email protected]>
Check for end of the input buffer when skipping over the filename field in the .gz file header.
Signed-off-by Lasse Collin <[email protected]>
---
lib/decompress_inflate.c +13 -4
@@ -100,13 +100,22 @@ STATIC int INIT gunzip(unsigned char *bu* possible asciz filename) */ strm->next_in = zbuf +10 ; + strm->avail_in = len -10 ;/* skip over asciz filename */ if (zbuf[3 ] &0x8 ) { -while (strm->next_in[0 ]) - strm->next_in++; - strm->next_in++; +do { +/* +* If the filename doesn't fit into the buffer, +* the file is very probably corrupt. Don't try +* to read more data. +*/ +if (strm->avail_in ==0 ) { +error ("header error" ); + goto gunzip_5; + } + --strm->avail_in; + }while (*strm->next_in++); } - strm->avail_in = len - (strm->next_in - zbuf); strm->next_out = out_buf; strm->avail_out = out_len;