mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

more SPL leak fixes

Browse Source
This commit is contained in:
Antony Dovgal 2005-12-20 12:41:24 +00:00
parent 9255733c4f
commit efff8a45e2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/spl/spl_iterators.c
View File

@ -370,6 +370,7 @@ SPL_METHOD(RecursiveIteratorIterator, __construct)
zval *iterator; zval *iterator;
zend_class_entry *ce_iterator; zend_class_entry *ce_iterator;
long mode = RIT_LEAVES_ONLY, flags = 0; long mode = RIT_LEAVES_ONLY, flags = 0;
int inc_refcount = 1;
php_set_error_handling(EH_THROW, spl_ce_InvalidArgumentException TSRMLS_CC); 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)) { if (instanceof_function(Z_OBJCE_P(iterator), zend_ce_aggregate TSRMLS_CC)) {
zval *aggregate = iterator; 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); 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 { } else {
iterator = NULL; iterator = NULL;
@ -426,7 +428,9 @@ SPL_METHOD(RecursiveIteratorIterator, __construct)
} }
ce_iterator = Z_OBJCE_P(iterator); /* respect inheritance, don't use spl_ce_RecursiveIterator */ 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); 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].zobject = iterator;
intern->iterators[0].ce = ce_iterator; intern->iterators[0].ce = ce_iterator;
intern->iterators[0].state = RS_START; intern->iterators[0].state = RS_START;