helly Tue Apr 27 11:41:26 2004 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
Fix LimitIterator by using new handler
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.32 php-src/ext/spl/spl_iterators.c:1.33
--- php-src/ext/spl/spl_iterators.c:1.32 Sun Apr 25 07:14:11 2004
+++ php-src/ext/spl/spl_iterators.c Tue Apr 27 11:41:26 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.32 2004/04/25 11:14:11 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.33 2004/04/27 15:41:26 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -610,6 +610,9 @@
static INLINE void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
{
+ if (intern->inner.iterator->funcs->invalidate_current) {
+
intern->inner.iterator->funcs->invalidate_current(intern->inner.iterator TSRMLS_CC);
+ }
if (intern->current.data) {
zval_ptr_dtor(&intern->current.data);
intern->current.data = NULL;
@@ -904,10 +907,9 @@
if (instanceof_function(intern->inner.ce, spl_ce_SeekableIterator TSRMLS_CC)) {
MAKE_STD_ZVAL(zpos);
ZVAL_LONG(zpos, pos);
+ spl_dual_it_free(intern TSRMLS_CC);
zend_call_method_with_1_params(&intern->inner.zobject,
intern->inner.ce, NULL, "seek", NULL, zpos);
zval_ptr_dtor(&zpos);
- spl_dual_it_free(intern TSRMLS_CC);
- zend_user_it_free_current(intern->inner.iterator TSRMLS_CC);
intern->current.pos = pos;
if (spl_limit_it_valid(intern TSRMLS_CC) == SUCCESS) {
spl_dual_it_fetch(intern, 0 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
