com php-src: Fixed support for references: ext/standard/array.c
| From: | Dmitry Stogov | Date: | Tue, 18 Mar 2014 09:20:11 +0000 |
| Subject: | com php-src: Fixed support for references: ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77556@lists.php.net to get a copy of this message | ||
Commit: 6b6e90368806da38ed568d7f125f72121c11b37c
Author: Dmitry Stogov <dmitry@zend.com> Tue, 18 Mar 2014 13:20:11 +0400
Parents: 2adecc6dc283fa39f4fc9d44ec128be497152323
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b6e90368806da38ed568d7f125f72121c11b37c
Log:
Fixed support for references
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index de3e4b5..cb3aa76 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1438,6 +1438,9 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval
*return_valu
{
zval *value_ptr, data;
+ if (Z_ISREF_P(entry)) {
+ entry = Z_REFVAL_P(entry);
+ }
if (Z_TYPE_P(entry) == IS_STRING) {
if ((value_ptr = zend_hash_find(eg_active_symbol_table, Z_STR_P(entry))) != NULL) {
ZVAL_DUP(&data, value_ptr);