The valid bit was necessary after all - restored

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 30bc86cfc415a4556ff1521be162fcc4af16811a..fbe6492ccfac63c9d23ec73eec570cdca3185a37 100644 (file)
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -45,11 +45,14 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS
        zend_uint i = 1;
 
        for (i = 1; i < objects->top ; i++) {
-               struct _store_object *obj = &objects->object_buckets[i].bucket.obj;
-               if (obj->dtor && !objects->object_buckets[i].destructor_called) {
-                       objects->object_buckets[i].destructor_called = 1;
-                       if (obj->dtor) {
-                               obj->dtor(obj->object, i TSRMLS_CC);
+               if (objects->object_buckets[i].valid) {
+                       struct _store_object *obj = &objects->object_buckets[i].bucket.obj;
+
+                       if (obj->dtor && !objects->object_buckets[i].destructor_called) {
+                               objects->object_buckets[i].destructor_called = 1;
+                               if (obj->dtor) {
+                                       obj->dtor(obj->object, i TSRMLS_CC);
+                               }
                        }
                }
        }
@@ -61,9 +64,12 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects
        zend_uint i = 1;
 
        for (i = 1; i < objects->top ; i++) {
-               struct _store_object *obj = &objects->object_buckets[i].bucket.obj;
-               if (obj->free_storage) {
-                       obj->free_storage(obj->object TSRMLS_CC);
+               if (objects->object_buckets[i].valid) {
+                       struct _store_object *obj = &objects->object_buckets[i].bucket.obj;
+
+                       if (obj->free_storage) {
+                               obj->free_storage(obj->object TSRMLS_CC);
+                       }
                }
        }
 }
@@ -88,11 +94,13 @@ ZEND_API zend_object_handle zend_objects_store_put(void *object, zend_objects_st
        }
        obj = &EG(objects_store).object_buckets[handle].bucket.obj;
        EG(objects_store).object_buckets[handle].destructor_called = 0;
+       EG(objects_store).object_buckets[handle].valid = 1;
 
        obj->refcount = 1;
        obj->object = object;
        obj->dtor = dtor;
        obj->free_storage = free_storage;
+
        obj->clone = clone;
 
 #if ZEND_DEBUG_OBJECTS
@@ -111,9 +119,10 @@ ZEND_API void zend_objects_store_add_ref(zval *object TSRMLS_DC)
 #endif
 }
 
-#define ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST()                                                                                                                          \
+#define ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST()                                                                                                                                  \
                        EG(objects_store).object_buckets[handle].bucket.free_list.next = EG(objects_store).free_list_head;      \
-                       EG(objects_store).free_list_head = handle;                                                                                                      \
+                       EG(objects_store).free_list_head = handle;                                                                                                                      \
+                       EG(objects_store).object_buckets[handle].valid = 0;
 
 ZEND_API void zend_objects_store_del_ref(zval *zobject TSRMLS_DC)
 {

diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index 3b23d6bb54e33e1166d088775e32b369bd0640db..48ca0a1ceab90fe0e5791f21a1259a8c012dd0e8 100644 (file)
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -31,6 +31,7 @@ typedef void (*zend_objects_store_clone_t)(void *object, void **object_clone TSR
 
 typedef struct _zend_object_store_bucket {
        zend_bool destructor_called;
+       zend_bool valid;
        union _store_bucket {
                struct _store_object {
                        void *object;