com php-src: Fix bug #72837 - integer overflow in bzdecompress caused heap corruption: ext/bz2/bz2.c

From: Date: Wed, 17 Aug 2016 09:33:06 +0000
Subject: com php-src: Fix bug #72837 - integer overflow in bzdecompress caused heap corruption: ext/bz2/bz2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93895@lists.php.net to get a copy of this message
Commit: a20112a1d69e550fafee88aa9065851925bcf3e0 Author: Anatol Belski <ab@php.net> Tue, 16 Aug 2016 12:34:25 +0200 Parents: 5ba1cbec0784636faeb7a527dbc1510f61bd5732 Branches: PHP-7.0.10 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a20112a1d69e550fafee88aa9065851925bcf3e0 Log: Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Conflicts: ext/bz2/bz2.c (cherry picked from commit 67d0fe39ee554563476ecae13c626580ae1a6612) Bugs: https://bugs.php.net/72837 Changed paths: M ext/bz2/bz2.c Diff: diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index bc6379a..60bb71e 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -594,16 +594,26 @@ static PHP_FUNCTION(bzdecompress) /* compression is better then 2:1, need to allocate more memory */ bzs.avail_out = source_len; size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32; + if (size > SIZE_MAX) { + /* no reason to continue if we're going to drop it anyway */ + break; + } dest = safe_erealloc(dest, 1, bzs.avail_out+1, (size_t) size ); bzs.next_out = dest + size; } if (error == BZ_STREAM_END || error == BZ_OK) { size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32; - dest = safe_erealloc(dest, 1, (size_t) size, 1); - dest[size] = '\0'; - RETVAL_STRINGL(dest, (int) size); - efree(dest); + if (size > SIZE_MAX) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Decompressed size too big, max is %zd", SIZE_MAX); + efree(dest); + RETVAL_LONG(BZ_MEM_ERROR); + } else { + dest = safe_erealloc(dest, 1, (size_t) size, 1); + dest[size] = '\0'; + RETVAL_STRINGL(dest, (size_t) size); + efree(dest); + } } else { /* real error */ efree(dest); RETVAL_LONG(error);

« previous php.cvs (#93895) next »