diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-08-25 22:40:33 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-08-25 22:40:33 +0300 |
| commit | 9d31b297057a46b8c3cbef137b615e2d8d3d3783 (patch) | |
| tree | 975e91de53e043a1d69315cb3323835b73e3abd1 /Zend/zend_operators.c | |
| parent | 2455ab2a2b2c0cef14c1e3625a250c47b58c3475 (diff) | |
| download | php-git-9d31b297057a46b8c3cbef137b615e2d8d3d3783.tar.gz | |
Avoid array duplication
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 77916f25a3..b88a01731e 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: |