diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-30 15:06:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-30 15:06:32 +0200 |
| commit | 0805e132b0de2fb738461f1465f72d3b65a72c39 (patch) | |
| tree | ebd0674c5756ce394a4eeab562dc0803aa2f5eeb | |
| parent | 2046b3ce4fd09063fdbe1eaf1824b5a1d0bed125 (diff) | |
| parent | 6fcde56b0370125c32e6a7d198aff2afd01c35dc (diff) | |
| download | php-git-0805e132b0de2fb738461f1465f72d3b65a72c39.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 1 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug78612.phpt | 18 |
3 files changed, 21 insertions, 0 deletions
@@ -31,6 +31,8 @@ PHP NEWS - Standard: . Fixed bug #76342 (file_get_contents waits twice specified timeout). (Thomas Calvet) + . Fixed bug #78612 (strtr leaks memory when integer keys are used and the + subject string shorter). (Nikita) 26 Sep 2019, PHP 7.3.10 diff --git a/ext/standard/string.c b/ext/standard/string.c index dde97faf4d..0bb4d3a0a9 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3068,6 +3068,7 @@ static void php_strtr_array(zval *return_value, zend_string *input, HashTable *p len = ZSTR_LEN(key_used); if (UNEXPECTED(len > slen)) { /* skip long patterns */ + zend_string_release(key_used); continue; } if (len > maxlen) { diff --git a/ext/standard/tests/strings/bug78612.phpt b/ext/standard/tests/strings/bug78612.phpt new file mode 100644 index 0000000000..7dad605e80 --- /dev/null +++ b/ext/standard/tests/strings/bug78612.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #78612 (strtr leaks memory when integer keys are used and the subject string shorter). +--FILE-- +<?php + +$find_replace = array(); +$_a = 7111222333000001; +$_b = 5000001; + +for ($j=0; $j<10; $j++) { + $find_replace[$_a + $j] = $_b + $j; +} + +echo strtr('Hello', $find_replace), "\n"; + +?> +--EXPECT-- +Hello |