com php-src: Fix bug #72837 - integer overflow in bzdecompress caused heap corruption: ext/bz2/bz2.c
| From: | Ferenc Kovacs | Date: | Thu, 18 Aug 2016 10:53:07 +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-93950@lists.php.net to get a copy of this message | ||
Commit: 69236ea9793b76b778c6cd64748cfee817521118
Author: Stanislav Malyshev <stas@php.net> Mon, 15 Aug 2016 23:17:26 -0700
Committer: Ferenc Kovacs <tyra3l@gmail.com> Thu, 18 Aug 2016 12:53:07 +0200
Parents: f973877a2f8d58b857f0f02b8a88a2ee05a1cbb0
Branches: PHP-5.6.25
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=69236ea9793b76b778c6cd64748cfee817521118
Log:
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
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 54b59f7..79ec3ec 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -196,7 +196,7 @@ php_stream_ops php_stream_bz2io_ops = {
};
/* {{{ Bzip2 stream openers */
-PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz,
+PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz,
const char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC)
{
struct php_bz2_stream_data_t *self;
@@ -574,15 +574,25 @@ 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 > INT_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, 0);
+ if (size > INT_MAX) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Decompressed size too big, max is %d",
INT_MAX);
+ efree(dest);
+ RETVAL_LONG(BZ_MEM_ERROR);
+ } else {
+ dest = safe_erealloc(dest, 1, (size_t) size, 1);
+ dest[size] = '\0';
+ RETVAL_STRINGL(dest, (int) size, 0);
+ }
} else { /* real error */
efree(dest);
RETVAL_LONG(error);