com php-src: Fixed add_ref: ext/spl/spl_iterators.c
| From: | Xinchen Hui | Date: | Sat, 28 Jun 2014 12:53:32 +0000 |
| Subject: | com php-src: Fixed add_ref: ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79106@lists.php.net to get a copy of this message | ||
Commit: e328e890ac0030714011df9e3bd55824bbbbd493
Author: Xinchen Hui <laruence@php.net> Sat, 28 Jun 2014 20:53:32 +0800
Parents: b53bc5c7623db88ba3a2f58c397c06e36e9cad5d
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e328e890ac0030714011df9e3bd55824bbbbd493
Log:
Fixed add_ref
Changed paths:
M ext/spl/spl_iterators.c
Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 9e1820c..80f2a62 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3460,7 +3460,7 @@ static int spl_iterator_to_array_apply(zend_object_iterator *iter, void *puser
T
array_set_zval_key(Z_ARRVAL_P(return_value), &key, data TSRMLS_CC);
zval_dtor(&key);
} else {
- Z_ADDREF_P(data);
+ Z_TRY_ADDREF_P(data);
add_next_index_zval(return_value, data);
}
return ZEND_HASH_APPLY_KEEP;