diff options
| author | Brian Shire <shire@php.net> | 2008-01-14 22:10:09 +0000 |
|---|---|---|
| committer | Brian Shire <shire@php.net> | 2008-01-14 22:10:09 +0000 |
| commit | 751b0807b1b2c9b37366d368d941696ce760ad78 (patch) | |
| tree | 973ed579d5c14198c6ad4b1dbf7702074c439375 /ext/standard/array.c | |
| parent | a2581f81d1e3e7e8823fd5e8ee6786f0d2accf72 (diff) | |
| download | php-git-751b0807b1b2c9b37366d368d941696ce760ad78.tar.gz | |
MFH: Fix bug #42850 array_walk_recursive() leaves references, refix bug #34982
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 1c76a929f2..306cace451 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1077,7 +1077,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata, int recursive if (recursive && Z_TYPE_PP(args[0]) == IS_ARRAY) { HashTable *thash; - SEPARATE_ZVAL_TO_MAKE_IS_REF(args[0]); + SEPARATE_ZVAL_IF_NOT_REF(args[0]); thash = HASH_OF(*(args[0])); if (thash->nApplyCount > 1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected"); |