diff options
| author | Anatol Belski <ab@php.net> | 2016-08-29 15:44:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-29 15:44:13 +0200 |
| commit | 50c5d13d26b5cd471c7be5db81cf5d57ff957437 (patch) | |
| tree | 50bf253ee405ae21c5c1eddac9adfcb5671e11f6 | |
| parent | a74757849776be99e86949e4862abf56bfa2115e (diff) | |
| parent | d80a317c0b58d94f74cc8bae1020166cf0f0e885 (diff) | |
| download | php-git-50c5d13d26b5cd471c7be5db81cf5d57ff957437.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak
| -rw-r--r-- | ext/standard/string.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 4ac9143bcf..a3b0add7f0 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3029,6 +3029,7 @@ static void php_strtr_array(zval *return_value, zend_string *input, HashTable *p } else { len = ZSTR_LEN(str_key); if (UNEXPECTED(len < 1)) { + efree(num_bitset); RETURN_FALSE; } else if (UNEXPECTED(len > slen)) { /* skip long patterns */ |