com php-src: Fixed refcounted: ext/spl/spl_iterators.c
| From: | Dmitry Stogov | Date: | Sat, 15 Mar 2014 14:13:55 +0000 |
| Subject: | com php-src: Fixed refcounted: ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77621@lists.php.net to get a copy of this message | ||
Commit: a49781f20d8493bc7719f25ec252951b5bfd6292
Author: Xinchen Hui <laruence@gmail.com> Sat, 15 Mar 2014 22:13:55 +0800
Parents: 9d4dca0880a692452b6b2456d64b6c69652fe161
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a49781f20d8493bc7719f25ec252951b5bfd6292
Log:
Fixed refcounted
Changed paths:
M ext/spl/spl_iterators.c
Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index e6c5319..10b7e5f 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1509,7 +1509,9 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS,
z
efree(cfi);
return NULL;
}
- Z_ADDREF(cfi->fci.function_name);
+ if (Z_REFCOUNTED_P(&cfi->fci.function_name)) {
+ Z_ADDREF(cfi->fci.function_name);
+ }
if (Z_TYPE(cfi->fcc.object) == IS_OBJECT) {
ZVAL_COPY(&cfi->object, &cfi->fcc.object);
}