com php-src: Fixed bug #70910 (extract() breaks variable references): ext/standard/array.c ext/standard/tests/array/bug70910.phpt

From: Date: Tue, 17 Nov 2015 12:15:44 +0000
Subject: com php-src: Fixed bug #70910 (extract() breaks variable references): ext/standard/array.c ext/standard/tests/array/bug70910.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89918@lists.php.net to get a copy of this message
Commit: 2aa400a0ffba12a551015e329ab53829d25b3805 Author: Xinchen Hui <laruence@gmail.com> Fri, 13 Nov 2015 19:39:59 -0800 Committer: Anatol Belski <ab@php.net> Tue, 17 Nov 2015 13:15:44 +0100 Parents: 815e456a7ada4865d1dfb3fbc90bfece4a02ba9e Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2aa400a0ffba12a551015e329ab53829d25b3805 Log: Fixed bug #70910 (extract() breaks variable references) Bugs: https://bugs.php.net/70910 Changed paths: M ext/standard/array.c A ext/standard/tests/array/bug70910.phpt Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 88818fe..0b15605 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1895,8 +1895,8 @@ PHP_FUNCTION(extract) } if (Z_TYPE(final_name) == IS_STRING && php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) { + zval *orig_var; if (extract_refs) { - zval *orig_var; ZVAL_MAKE_REF(entry); Z_ADDREF_P(entry); @@ -1913,7 +1913,16 @@ PHP_FUNCTION(extract) } else { ZVAL_DEREF(entry); if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); - zend_hash_update_ind(symbol_table, Z_STR(final_name), entry); + if ((orig_var = zend_hash_find(symbol_table, Z_STR(final_name))) != NULL) { + if (Z_TYPE_P(orig_var) == IS_INDIRECT) { + orig_var = Z_INDIRECT_P(orig_var); + } + ZVAL_DEREF(orig_var); + zval_ptr_dtor(orig_var); + ZVAL_COPY_VALUE(orig_var, entry); + } else { + zend_hash_update(symbol_table, Z_STR(final_name), entry); + } } count++; } diff --git a/ext/standard/tests/array/bug70910.phpt b/ext/standard/tests/array/bug70910.phpt new file mode 100644 index 0000000..c7eb36c --- /dev/null +++ b/ext/standard/tests/array/bug70910.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #70910 (extract() breaks variable references) +--FILE-- +<?php +$var = 'original value'; +$ref =& $var; + +$hash = ['var' => 'new value']; + +extract($hash); +var_dump($var === $ref); +--EXPECT-- +bool(true)

« previous php.cvs (#89918) next »