diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:19:15 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:19:15 +0300 |
| commit | b2cdde08269c837a6c085dbc5d102c4b318b6150 (patch) | |
| tree | eaeec880c2f116598826522eb8052253363b5e85 /ext/simplexml | |
| parent | 4d1d5babde725febc5fdc7a7ccf576f3d0e3c099 (diff) | |
| parent | 83804519dffcbb23ef689b37816ee28f2c3192e0 (diff) | |
| download | php-git-b2cdde08269c837a6c085dbc5d102c4b318b6150.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/simplexml.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 6222ed5d2c..2ea83a1aa2 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -356,7 +356,7 @@ long_dim: } if (Z_ISUNDEF_P(rv)) { - ZVAL_COPY_VALUE(rv, &EG(uninitialized_zval)); + ZVAL_NULL(rv); } return rv; @@ -2405,7 +2405,8 @@ zend_object_iterator *php_sxe_get_iterator(zend_class_entry *ce, zval *object, i iterator = emalloc(sizeof(php_sxe_iterator)); zend_iterator_init(&iterator->intern); - ZVAL_COPY(&iterator->intern.data, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&iterator->intern.data, Z_OBJ_P(object)); iterator->intern.funcs = &php_sxe_iterator_funcs; iterator->sxe = Z_SXEOBJ_P(object); |