Merge branch 'PHP-8.3'

dstogov · dstogov · commit f83cdce0df8a · 2024-01-22T10:33:18.000+03:00
* PHP-8.3:
  Wrap cleanup function call with zend_try.
diff --git a/sapi/fuzzer/fuzzer-sapi.c b/sapi/fuzzer/fuzzer-sapi.c
@@ -281,7 +281,9 @@ int fuzzer_do_request_from_buffer(
 
 	CG(compiled_filename) = NULL; /* ??? */
 	if (before_shutdown) {
-		before_shutdown();
+		zend_try {
+			before_shutdown();
+		} zend_end_try();
 	}
 	fuzzer_request_shutdown();
 

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,9 @@ int fuzzer_do_request_from_buffer(`
`281`	`281`
`282`	`282`	`CG(compiled_filename) = NULL; /* ??? */`
`283`	`283`	`if (before_shutdown) {`
`284`		`- before_shutdown();`
	`284`	`+ zend_try {`
	`285`	`+ before_shutdown();`
	`286`	`+ } zend_end_try();`
`285`	`287`	`}`
`286`	`288`	`fuzzer_request_shutdown();`
`287`	`289`