Use zend_clear_exception(à API

Girgias · Girgias · commit 700f189a92f1 · 2021-04-26T15:11:16.000+01:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7378,8 +7378,7 @@ ZEND_VM_HANDLER(202, 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
@@ -2900,8 +2900,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
`@@ -7378,8 +7378,7 @@ ZEND_VM_HANDLER(202, ZEND_SILENCE_CATCH, ANY, ANY)`
`7378`	`7378`	`DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);`
`7379`	`7379`	`}`
`7380`	`7380`	`#endif /* HAVE_DTRACE */`
`7381`		`- OBJ_RELEASE(EG(exception));`
`7382`		`- EG(exception) = NULL;`
	`7381`	`+ zend_clear_exception();`
`7383`	`7382`
`7384`	`7383`	`/* Free object (needed to not leak memory on @new) */`
`7385`	`7384`	`if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {`
Original file line number	Diff line number	Diff line change
`@@ -2900,8 +2900,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN`
`2900`	`2900`	`DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);`
`2901`	`2901`	`}`
`2902`	`2902`	`#endif /* HAVE_DTRACE */`
`2903`		`- OBJ_RELEASE(EG(exception));`
`2904`		`- EG(exception) = NULL;`
	`2903`	`+ zend_clear_exception();`
`2905`	`2904`
`2906`	`2905`	`/* Free object (needed to not leak memory on @new) */`
`2907`	`2906`	`if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_OBJECT) {`