remove goto

NattyNarwhal · NattyNarwhal · commit b1d3f508bfe0 · 2026-03-03T17:27:20.000-04:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -638,11 +638,9 @@ ZEND_API zend_string *zend_trace_current_function_args_string(void) {
 		return NULL; /* don't need to free */
 	}
 	first_frame = zend_hash_index_find(Z_ARRVAL(backtrace), 0);
-	if (!first_frame) {
-		goto free_backtrace;
+	if (first_frame) {
+		dynamic_params = zend_trace_function_args_to_string(Z_ARRVAL_P(first_frame));
 	}
-	dynamic_params = zend_trace_function_args_to_string(Z_ARRVAL_P(first_frame));
-free_backtrace:
 	zval_ptr_dtor(&backtrace);
 	/* free the string after we use it */
 	return dynamic_params;

Original file line number	Diff line number	Diff line change
`@@ -638,11 +638,9 @@ ZEND_API zend_string *zend_trace_current_function_args_string(void) {`
`638`	`638`	`return NULL; /* don't need to free */`
`639`	`639`	`}`
`640`	`640`	`first_frame = zend_hash_index_find(Z_ARRVAL(backtrace), 0);`
`641`		`- if (!first_frame) {`
`642`		`- goto free_backtrace;`
	`641`	`+ if (first_frame) {`
	`642`	`+ dynamic_params = zend_trace_function_args_to_string(Z_ARRVAL_P(first_frame));`
`643`	`643`	`}`
`644`		`- dynamic_params = zend_trace_function_args_to_string(Z_ARRVAL_P(first_frame));`
`645`		`-free_backtrace:`
`646`	`644`	`zval_ptr_dtor(&backtrace);`
`647`	`645`	`/* free the string after we use it */`
`648`	`646`	`return dynamic_params;`