Wrap cleanup function call with zend_try.

dstogov · dstogov · commit b45e7a613f42 · 2024-01-22T10:32:04.000+03:00
Fizes oss-fuzz #65911
diff --git a/sapi/fuzzer/fuzzer-sapi.c b/sapi/fuzzer/fuzzer-sapi.c
@@ -280,7 +280,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
`@@ -280,7 +280,9 @@ int fuzzer_do_request_from_buffer(`
`280`	`280`
`281`	`281`	`CG(compiled_filename) = NULL; /* ??? */`
`282`	`282`	`if (before_shutdown) {`
`283`		`- before_shutdown();`
	`283`	`+ zend_try {`
	`284`	`+ before_shutdown();`
	`285`	`+ } zend_end_try();`
`284`	`286`	`}`
`285`	`287`	`fuzzer_request_shutdown();`
`286`	`288`