Use zend_clear_exception(à API

Girgias · Girgias · commit 2a3eaf692e9a · 2021-09-22T01:02:06.000+01:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7419,8 +7419,7 @@ ZEND_VM_HANDLER(203, 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
@@ -2922,8 +2922,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
`@@ -7419,8 +7419,7 @@ ZEND_VM_HANDLER(203, ZEND_SILENCE_CATCH, ANY, ANY)`
`7419`	`7419`	`DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);`
`7420`	`7420`	`}`
`7421`	`7421`	`#endif /* HAVE_DTRACE */`
`7422`		`- OBJ_RELEASE(EG(exception));`
`7423`		`- EG(exception) = NULL;`
	`7422`	`+ zend_clear_exception();`
`7424`	`7423`
`7425`	`7424`	`/* Free object (needed to not leak memory on @new) */`
`7426`	`7425`	`if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {`
Original file line number	Diff line number	Diff line change
`@@ -2922,8 +2922,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN`
`2922`	`2922`	`DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);`
`2923`	`2923`	`}`
`2924`	`2924`	`#endif /* HAVE_DTRACE */`
`2925`		`- OBJ_RELEASE(EG(exception));`
`2926`		`- EG(exception) = NULL;`
	`2925`	`+ zend_clear_exception();`
`2927`	`2926`
`2928`	`2927`	`/* Free object (needed to not leak memory on @new) */`
`2929`	`2928`	`if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {`