com php-src: Avoid array duplication: Zend/zend_operators.c
| From: | Dmitry Stogov | Date: | Tue, 25 Aug 2015 19:40:33 +0000 |
| Subject: | com php-src: Avoid array duplication: Zend/zend_operators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88751@lists.php.net to get a copy of this message | ||
Commit: 9d31b297057a46b8c3cbef137b615e2d8d3d3783
Author: Dmitry Stogov <dmitry@zend.com> Tue, 25 Aug 2015 22:40:33 +0300
Parents: 2455ab2a2b2c0cef14c1e3625a250c47b58c3475
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d31b297057a46b8c3cbef137b615e2d8d3d3783
Log:
Avoid array duplication
Changed paths:
M Zend/zend_operators.c
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 77916f2..b88a017 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -642,10 +642,12 @@ try_again:
switch (Z_TYPE_P(op)) {
case IS_ARRAY:
{
- zval tmp;
- ZVAL_COPY_VALUE(&tmp, op);
- SEPARATE_ARRAY(&tmp);
- object_and_properties_init(op, zend_standard_class_def, Z_ARR(tmp));
+ HashTable *ht = Z_ARR_P(op);
+ if (Z_IMMUTABLE_P(op)) {
+ /* TODO: try not to duplicate immutable arrays as well ??? */
+ ht = zend_array_dup(ht);
+ }
+ object_and_properties_init(op, zend_standard_class_def, ht);
break;
}
case IS_OBJECT: