diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-02-16 11:03:09 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-02-16 11:03:09 +0800 |
| commit | 5c08bb654bf13c44d0ce48883a7411eebb46fab6 (patch) | |
| tree | 48211d08f78bc8a83ceca536680d96695859c505 /ext | |
| parent | 77ca527c91a253c00850ea4bab242af25fd71df5 (diff) | |
| parent | 0fccd154bdb27476289bab18a9112fb7b20ae607 (diff) | |
| download | php-git-5c08bb654bf13c44d0ce48883a7411eebb46fab6.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71603 (compact() maintains references in php7)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/array.c | 1 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug71603.phpt | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index b04d5cdb3f..e78cf7f775 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1938,6 +1938,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu ZVAL_DEREF(entry); if (Z_TYPE_P(entry) == IS_STRING) { if ((value_ptr = zend_hash_find_ind(eg_active_symbol_table, Z_STR_P(entry))) != NULL) { + ZVAL_DEREF(value_ptr); ZVAL_COPY(&data, value_ptr); zend_hash_update(Z_ARRVAL_P(return_value), Z_STR_P(entry), &data); } diff --git a/ext/standard/tests/array/bug71603.phpt b/ext/standard/tests/array/bug71603.phpt new file mode 100644 index 0000000000..0c25be660c --- /dev/null +++ b/ext/standard/tests/array/bug71603.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #71603 (compact() maintains references in php7) +--FILE-- +<?php +$foo = "okey"; +$foo_reference =& $foo; + +$array = compact('foo_reference'); + +$foo = 'changed!'; + +var_dump($array['foo_reference']); + +--EXPECT-- +string(4) "okey" |