Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 9f79a98a4ca3 · 2024-01-22T10:33:09.000+03:00
* PHP-8.2:
  Wrap cleanup function call with zend_try.
diff --git a/sapi/fuzzer/fuzzer-sapi.c b/sapi/fuzzer/fuzzer-sapi.c
@@ -283,7 +283,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
`@@ -283,7 +283,9 @@ int fuzzer_do_request_from_buffer(`
`283`	`283`
`284`	`284`	`CG(compiled_filename) = NULL; /* ??? */`
`285`	`285`	`if (before_shutdown) {`
`286`		`- before_shutdown();`
	`286`	`+ zend_try {`
	`287`	`+ before_shutdown();`
	`288`	`+ } zend_end_try();`
`287`	`289`	`}`
`288`	`290`	`fuzzer_request_shutdown();`
`289`	`291`