From: Zeev Suraski <zeev@php.net>
Date: Wed, 4 Feb 2004 12:30:48 +0000 (+0000)
Subject: The valid bit was necessary after all - restored
X-Git-Tag: php-5.0.0b4RC1~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c3e03a2ffba218fd25ec699162971a772246b60;p=php

The valid bit was necessary after all - restored
---

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 30bc86cfc4..fbe6492ccf 100644
--- 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 3b23d6bb54..48ca0a1cea 100644
--- 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;