Don't use zend_try around dtor_obj() and free_obj()

Without these zend_trys we may
a) leak the object (fine)
b) don't add it to the free list (also fine, we just lose an
   object store bucket)
c) don't remove it from the GC root buffer (also fine, because GC
   explicitly checks for both FREE_CALLED and invalid buckets)

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 3aedba1bda3f6a0b47943be4834463eaf1b38025..53a0c3be2388e4058f140265a6699c9c3b6c91f4 100644 (file)
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -152,18 +152,12 @@ ZEND_API void zend_objects_store_del(zend_object *object) /* {{{ */
        if (EG(objects_store).object_buckets &&
            IS_OBJ_VALID(EG(objects_store).object_buckets[object->handle])) {
                if (GC_REFCOUNT(object) == 0) {
-                       int failure = 0;
-
                        if (!(GC_FLAGS(object) & IS_OBJ_DESTRUCTOR_CALLED)) {
                                GC_FLAGS(object) |= IS_OBJ_DESTRUCTOR_CALLED;
 
                                if (object->handlers->dtor_obj) {
                                        GC_REFCOUNT(object)++;
-                                       zend_try {
-                                               object->handlers->dtor_obj(object);
-                                       } zend_catch {
-                                               failure = 1;
-                                       } zend_end_try();
+                                       object->handlers->dtor_obj(object);
                                        GC_REFCOUNT(object)--;
                                }
                        }
@@ -176,13 +170,9 @@ ZEND_API void zend_objects_store_del(zend_object *object) /* {{{ */
                                if (!(GC_FLAGS(object) & IS_OBJ_FREE_CALLED)) {
                                        GC_FLAGS(object) |= IS_OBJ_FREE_CALLED;
                                        if (object->handlers->free_obj) {
-                                               zend_try {
-                                                       GC_REFCOUNT(object)++;
-                                                       object->handlers->free_obj(object);
-                                                       GC_REFCOUNT(object)--;
-                                               } zend_catch {
-                                                       failure = 1;
-                                               } zend_end_try();
+                                               GC_REFCOUNT(object)++;
+                                               object->handlers->free_obj(object);
+                                               GC_REFCOUNT(object)--;
                                        }
                                }
                                ptr = ((char*)object) - object->handlers->offset;
@@ -190,10 +180,6 @@ ZEND_API void zend_objects_store_del(zend_object *object) /* {{{ */
                                efree(ptr);
                                ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(handle);
                        }
-
-                       if (failure) {
-                               zend_bailout();
-                       }
                } else {
                        GC_REFCOUNT(object)--;
                }