diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-12-20 12:41:24 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-12-20 12:41:24 +0000 |
| commit | efff8a45e2f55ddd43065e8295b4976e99671e55 (patch) | |
| tree | 5db7221748e5c010f3ef0ba0436c648d61793ce5 | |
| parent | 9255733c4fa523e390d0973d3d342fd8a76d564a (diff) | |
| download | php-git-efff8a45e2f55ddd43065e8295b4976e99671e55.tar.gz | |
more SPL leak fixes
| -rwxr-xr-x | ext/spl/spl_iterators.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 330dcdb478..8e0e5cd6ca 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -370,6 +370,7 @@ SPL_METHOD(RecursiveIteratorIterator, __construct) zval *iterator; zend_class_entry *ce_iterator; long mode = RIT_LEAVES_ONLY, flags = 0; + int inc_refcount = 1; php_set_error_handling(EH_THROW, spl_ce_InvalidArgumentException TSRMLS_CC); @@ -377,6 +378,7 @@ SPL_METHOD(RecursiveIteratorIterator, __construct) if (instanceof_function(Z_OBJCE_P(iterator), zend_ce_aggregate TSRMLS_CC)) { zval *aggregate = iterator; zend_call_method_with_0_params(&aggregate, Z_OBJCE_P(aggregate), &Z_OBJCE_P(aggregate)->iterator_funcs.zf_new_iterator, "getiterator", &iterator); + inc_refcount = 0; } } else { iterator = NULL; @@ -426,7 +428,9 @@ SPL_METHOD(RecursiveIteratorIterator, __construct) } ce_iterator = Z_OBJCE_P(iterator); /* respect inheritance, don't use spl_ce_RecursiveIterator */ intern->iterators[0].iterator = ce_iterator->get_iterator(ce_iterator, iterator TSRMLS_CC); - iterator->refcount++; + if (inc_refcount) { + iterator->refcount++; + } intern->iterators[0].zobject = iterator; intern->iterators[0].ce = ce_iterator; intern->iterators[0].state = RS_START; |