It appears that the zend iterators need to go back to using the dtor
callback rather than free storage.
throwing an unhandled exception in any of the iterator foreach loops in SPL,
SXE and DOM results in a segfault due to improper cleanup.
To reproduce, put a throw new exception within one of the foreach calls in
limititerator or array_iterator from the SPL tests.
Registering dtor instead of a free storage callback in zend_iterator_wrap
seems to let the iterator objects cleanup properly.
Also in zend_objects_store_del_ref, free_storage is never tested so if an
object doesn't implement this, it causes a segfault.
Patch attached.
Rob
Index: zend_iterators.c
===================================================================
RCS file: /repository/ZendEngine2/zend_iterators.c,v
retrieving revision 1.9
diff -u -r1.9 zend_iterators.c
--- zend_iterators.c 4 Feb 2004 21:04:12 -0000 1.9
+++ zend_iterators.c 8 Feb 2004 15:54:21 -0000
@@ -54,7 +54,7 @@
zend_iterator_class_entry.name = "__iterator_wrapper";
}
-static void iter_wrapper_free_storage(zend_object *object TSRMLS_DC)
+static void iter_wrapper_dtor(void *object, zend_object_handle handle TSRMLS_DC)
{
zend_object_iterator *iter = (zend_object_iterator*)object;
iter->funcs->dtor(iter TSRMLS_CC);
@@ -66,7 +66,7 @@
MAKE_STD_ZVAL(wrapped);
Z_TYPE_P(wrapped) = IS_OBJECT;
- wrapped->value.obj.handle = zend_objects_store_put(iter, NULL,
iter_wrapper_free_storage, NULL TSRMLS_CC);
+ wrapped->value.obj.handle = zend_objects_store_put(iter, iter_wrapper_dtor,
NULL, NULL TSRMLS_CC);
wrapped->value.obj.handlers = &iterator_object_handlers;
return wrapped;
Index: zend_objects_API.c
===================================================================
RCS file: /repository/ZendEngine2/zend_objects_API.c,v
retrieving revision 1.28
diff -u -r1.28 zend_objects_API.c
--- zend_objects_API.c 4 Feb 2004 12:30:48 -0000 1.28
+++ zend_objects_API.c 8 Feb 2004 15:54:22 -0000
@@ -136,7 +136,9 @@
obj->dtor(obj->object, handle TSRMLS_CC);
}
if (obj->refcount == 0) {
- obj->free_storage(obj->object TSRMLS_CC);
+ if (obj->free_storage) {
+ obj->free_storage(obj->object TSRMLS_CC);
+ }
ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST();
}
}
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
