com php-src: Fixed bug #70910 (extract() breaks variable references): NEWS ext/standard/array.c ext/standard/tests/array/bug70910.phpt
| From: | Xinchen Hui | Date: | Sat, 14 Nov 2015 03:39:59 +0000 |
| Subject: | com php-src: Fixed bug #70910 (extract() breaks variable references): NEWS ext/standard/array.c ext/standard/tests/array/bug70910.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89842@lists.php.net to get a copy of this message | ||
Commit: fce44a5a131f4d897ed9472fcf9a05efdbaa4d03
Author: Xinchen Hui <laruence@gmail.com> Fri, 13 Nov 2015 19:39:59 -0800
Parents: 25de928df77d9906c81becddca42143d19d6eedd
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fce44a5a131f4d897ed9472fcf9a05efdbaa4d03
Log:
Fixed bug #70910 (extract() breaks variable references)
Bugs:
https://bugs.php.net/70910
Changed paths:
M NEWS
M ext/standard/array.c
A ext/standard/tests/array/bug70910.phpt
Diff:
diff --git a/NEWS b/NEWS
index fd2e129..3bcca21 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP NEWS
- Core:
. Fixed bug #70912 (Null ptr dereference instantiating class with invalid
array property). (Laruence)
+ . Fixed bug #70910 (extract() breaks variable references). (Laruence)
. Fixed bug #70898, #70895 (null ptr deref and segfault with crafted callable).
(Anatol, Laruence)
diff --git a/ext/standard/array.c b/ext/standard/array.c
index a327da8..c1a716d 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)