diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-21 18:09:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-21 18:10:48 +0800 |
| commit | 817513af4ec5e5a45fdd7ecd0a00e728d00c3ff3 (patch) | |
| tree | f907f52af4b15852eb43d2aa29bacf46f4967440 | |
| parent | c85f569e5248893539c129e867896db56e1eff28 (diff) | |
| download | php-git-817513af4ec5e5a45fdd7ecd0a00e728d00c3ff3.tar.gz | |
Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if not already set)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -45,6 +45,10 @@ PHP NEWS - Opcache: . Fixed bug #71127 (Define in auto_prepend_file is overwrite). (Laruence) +- PCRE: + . Fixed bug #71178 (preg_replace with arrays creates [0] in replace array + if not already set). (Laruence) + - Readline: . Fixed bug #71094 (readline_completion_function corrupts static array on second TAB). (Nikita) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 66ee238dc4..6769eb7d9a 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1380,7 +1380,7 @@ static zend_string *php_replace_in_subject(zval *regex, zval *replace, zval *sub /* Get current entry */ replace_entry = NULL; while (replace_idx < Z_ARRVAL_P(replace)->nNumUsed) { - if (Z_TYPE(Z_ARRVAL_P(replace)->arData[replace_idx].val) != IS_UNUSED) { + if (Z_TYPE(Z_ARRVAL_P(replace)->arData[replace_idx].val) != IS_UNDEF) { replace_entry = &Z_ARRVAL_P(replace)->arData[replace_idx].val; break; } |