cvs: ZendEngine2 / zend_objects_API.c
| From: | Andi Gutmans | Date: | Sun, 07 Jul 2002 19:34:35 +0000 |
| Subject: | cvs: ZendEngine2 / zend_objects_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-241@lists.php.net to get a copy of this message | ||
andi Sun Jul 7 15:34:35 2002 EDT
Modified files:
/ZendEngine2 zend_objects_API.c
Log:
- First try at solving problem with different objects being allocated the
- same id.
Index: ZendEngine2/zend_objects_API.c
diff -u ZendEngine2/zend_objects_API.c:1.3 ZendEngine2/zend_objects_API.c:1.4
--- ZendEngine2/zend_objects_API.c:1.3 Sat Jun 15 04:47:11 2002
+++ ZendEngine2/zend_objects_API.c Sun Jul 7 15:34:34 2002
@@ -115,12 +115,14 @@
if (--obj->refcount == 0) {
if (EG(objects_store).object_buckets[handle].valid) {
- if(obj->dtor && !EG(objects_store).object_buckets[handle].destructor_called) {
+ if(!EG(objects_store).object_buckets[handle].destructor_called) {
EG(objects_store).object_buckets[handle].destructor_called = 1;
- obj->dtor(obj->object, handle TSRMLS_CC);
+ if (obj->dtor) {
+ obj->dtor(obj->object, handle TSRMLS_CC);
+ }
+ ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST();
}
}
- ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST();
#if ZEND_DEBUG_OBJECTS
fprintf(stderr, "Deallocated object id #%d\n", handle);
#endif