From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 19 Mar 2014 19:50:50 +0000 (+0400)
Subject: Mark objects that are going to be deleted
X-Git-Tag: POST_PHPNG_MERGE~412^2~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5db78476e310bef25c6e0a9f0c4c07d6f2532a15;p=php

Mark objects that are going to be deleted
---

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 77b7ee103a..f0db534cc3 100644
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -120,6 +120,7 @@ ZEND_API void zend_objects_store_free(zend_object *object TSRMLS_DC) /* {{{ */
 {
 	int handle = object->handle;
 
+	EG(objects_store).object_buckets[handle] = SET_INVALID(object);
 	if (object->handlers->free_obj) {
 		object->handlers->free_obj(object TSRMLS_CC);
 	}
@@ -155,6 +156,7 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */
 			if (object->gc.refcount == 0) {
 				zend_uint handle = object->handle;
 
+				EG(objects_store).object_buckets[handle] = SET_INVALID(object);
 				if (object->handlers->free_obj) {
 					zend_try {
 						object->handlers->free_obj(object TSRMLS_CC);