Use zend_clear_exception(à API

Girgias · Girgias · commit 2821ee4d029b · 2021-03-06T17:02:45.000Z
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7344,8 +7344,7 @@ ZEND_VM_HANDLER(201, ZEND_SILENCE_CATCH, ANY, ANY)
 			DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);
 		}
 #endif /* HAVE_DTRACE */
-		OBJ_RELEASE(EG(exception));
-		EG(exception) = NULL;
+		zend_clear_exception();
 
 		/* Free object (needed to not leak memory on @new) */
 		if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -2782,8 +2782,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN
 			DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);
 		}
 #endif /* HAVE_DTRACE */
-		OBJ_RELEASE(EG(exception));
-		EG(exception) = NULL;
+		zend_clear_exception();
 
 		/* Free object (needed to not leak memory on @new) */
 		if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {

Original file line number	Diff line number	Diff line change
`@@ -7344,8 +7344,7 @@ ZEND_VM_HANDLER(201, ZEND_SILENCE_CATCH, ANY, ANY)`
`7344`	`7344`	`DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);`
`7345`	`7345`	`}`
`7346`	`7346`	`#endif /* HAVE_DTRACE */`
`7347`		`- OBJ_RELEASE(EG(exception));`
`7348`		`- EG(exception) = NULL;`
	`7347`	`+ zend_clear_exception();`
`7349`	`7348`
`7350`	`7349`	`/* Free object (needed to not leak memory on @new) */`
`7351`	`7350`	`if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {`
Original file line number	Diff line number	Diff line change
`@@ -2782,8 +2782,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN`
`2782`	`2782`	`DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);`
`2783`	`2783`	`}`
`2784`	`2784`	`#endif /* HAVE_DTRACE */`
`2785`		`- OBJ_RELEASE(EG(exception));`
`2786`		`- EG(exception) = NULL;`
	`2785`	`+ zend_clear_exception();`
`2787`	`2786`
`2788`	`2787`	`/* Free object (needed to not leak memory on @new) */`
`2789`	`2788`	`if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {`