com php-src: fixed IS_REFERENCE handling: ext/standard/ array.c

From: Date: Tue, 02 Aug 2016 03:05:51 +0000
Subject: com php-src: fixed IS_REFERENCE handling: ext/standard/ array.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93510@lists.php.net to get a copy of this message
Commit: a15902fa71eb0b116e6f4bcdf972e8b57c74167c Author: Xinchen Hui <laruence@gmail.com> Tue, 2 Aug 2016 11:04:52 +0800 Parents: f93061471b5541525a39821da70b674b830284df Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a15902fa71eb0b116e6f4bcdf972e8b57c74167c Log: fixed IS_REFERENCE handling Changed paths: M ext/standard/array.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 2680ac6..949abb2 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3012,7 +3012,7 @@ PHP_FUNCTION(array_slice) break; } ZEND_HASH_FILL_ADD(entry); - Z_TRY_ADDREF_P(entry); + zval_add_ref(entry); } ZEND_HASH_FOREACH_END(); } ZEND_HASH_FILL_END(); } else { @@ -3034,7 +3034,7 @@ PHP_FUNCTION(array_slice) entry = zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), entry); } } - Z_TRY_ADDREF_P(entry); + zval_add_ref(entry); } ZEND_HASH_FOREACH_END(); } } @@ -3658,7 +3658,7 @@ PHP_FUNCTION(array_reverse) ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) { ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(input), entry) { ZEND_HASH_FILL_ADD(entry); - Z_TRY_ADDREF_P(entry); + zval_add_ref(entry); } ZEND_HASH_FOREACH_END(); } ZEND_HASH_FILL_END(); } else { @@ -3672,7 +3672,7 @@ PHP_FUNCTION(array_reverse) entry = zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), entry); } } - Z_TRY_ADDREF_P(entry); + zval_add_ref(entry); } ZEND_HASH_FOREACH_END(); } }

« previous php.cvs (#93510) next »