com php-src: Fixed refcount asseration: ext/spl/spl_iterators .c
| From: | Dmitry Stogov | Date: | Sat, 15 Mar 2014 11:16:07 +0000 |
| Subject: | com php-src: Fixed refcount asseration: ext/spl/spl_iterators .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77655@lists.php.net to get a copy of this message | ||
Commit: 19045f0d273afb5087a1651e8ed07168ee02a717
Author: Xinchen Hui <laruence@gmail.com> Sat, 15 Mar 2014 19:16:07 +0800
Parents: 8558dc8eaf2a01cb3349d19d49377200cc689c0f
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=19045f0d273afb5087a1651e8ed07168ee02a717
Log:
Fixed refcount asseration
Changed paths:
M ext/spl/spl_iterators.c
Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 663e207..9a29846 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3487,7 +3487,9 @@ static int spl_iterator_to_values_apply(zend_object_iterator *iter, void
*puser
if (data == NULL) {
return ZEND_HASH_APPLY_STOP;
}
- Z_ADDREF_P(data);
+ if (Z_REFCOUNTED_P(data)) {
+ Z_ADDREF_P(data);
+ }
add_next_index_zval(return_value, data);
return ZEND_HASH_APPLY_KEEP;
}