MFH: Fixed bug #34802 (Fixed crash on object instantiation failure).

Ilia Alshanetsky · Ilia Alshanetsky · commit 58a0906bf962 · 2005-10-10T14:31:12.000Z
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
@@ -51,7 +51,7 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS
 
 			if (!objects->object_buckets[i].destructor_called) {
 				objects->object_buckets[i].destructor_called = 1;
-				if (obj->dtor) {
+				if (obj->dtor && obj->object) {
 					obj->dtor(obj->object, i TSRMLS_CC);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS`
`51`	`51`
`52`	`52`	`if (!objects->object_buckets[i].destructor_called) {`
`53`	`53`	`objects->object_buckets[i].destructor_called = 1;`
`54`		`- if (obj->dtor) {`
	`54`	`+ if (obj->dtor && obj->object) {`
`55`	`55`	`obj->dtor(obj->object, i TSRMLS_CC);`
`56`	`56`	`}`
`57`	`57`	`}`