- Fix crash in destructors(). You can't throw an exception in destructors

Andi Gutmans · Andi Gutmans · commit 8912a50bf47e · 2004-03-01T19:45:07.000Z
as there is no guaranteed time when the destructor will be called.
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
@@ -68,7 +68,15 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 		zobj.value.obj.handlers = &std_object_handlers;
 		INIT_PZVAL(obj);
 
+		if (EG(exception)) {
+			zval_ptr_dtor(&EG(exception));
+			EG(exception) = NULL;
+		}
 		zend_call_method_with_0_params(&obj, object->ce, NULL, "__destruct", NULL);
+		if (EG(exception)) {
+			zval_ptr_dtor(&EG(exception));
+			EG(exception) = NULL;
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,15 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl`
`68`	`68`	`zobj.value.obj.handlers = &std_object_handlers;`
`69`	`69`	`INIT_PZVAL(obj);`
`70`	`70`
	`71`	`+ if (EG(exception)) {`
	`72`	`+ zval_ptr_dtor(&EG(exception));`
	`73`	`+ EG(exception) = NULL;`
	`74`	`+ }`
`71`	`75`	`zend_call_method_with_0_params(&obj, object->ce, NULL, "__destruct", NULL);`
	`76`	`+ if (EG(exception)) {`
	`77`	`+ zval_ptr_dtor(&EG(exception));`
	`78`	`+ EG(exception) = NULL;`
	`79`	`+ }`
`72`	`80`	`}`
`73`	`81`	`}`
`74`	`82`