diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-05 13:59:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-05 13:59:35 -0700 |
| commit | f7f8aae33cdaf74ca2d360ccf24256d6afd99b39 (patch) | |
| tree | 482f035296f161367dfdf769f1520364716d5118 /ext/bz2 | |
| parent | 86ae78d7c67cf9b43dbee0033557058e5901047f (diff) | |
| parent | 669763d88a8bb9707a45f0937a129b63a161d2f0 (diff) | |
| download | php-git-f7f8aae33cdaf74ca2d360ccf24256d6afd99b39.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
More int->size_t and string overflow fixes
Diffstat (limited to 'ext/bz2')
| -rw-r--r-- | ext/bz2/bz2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index 89129b60fd..45b309d275 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -589,8 +589,8 @@ static PHP_FUNCTION(bzdecompress) bzs.avail_in = source_len; /* in most cases bz2 offers at least 2:1 compression, so we use that as our base */ + dest = zend_string_safe_alloc(source_len, 2, 1, 0); bzs.avail_out = source_len * 2; - dest = zend_string_alloc(bzs.avail_out + 1, 0); bzs.next_out = ZSTR_VAL(dest); while ((error = BZ2_bzDecompress(&bzs)) == BZ_OK && bzs.avail_in > 0) { |