Fix GH-14643 ext/standard: segfault on user shutdown function release.

devnexen · devnexen · commit d0a1708c7ed3 · 2024-06-24T21:18:23.000+01:00
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -1582,9 +1582,12 @@ static void fci_release(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache)
 void user_shutdown_function_dtor(zval *zv) /* {{{ */
 {
 	php_shutdown_function_entry *shutdown_function_entry = Z_PTR_P(zv);
+	zend_fcall_info *fci = &shutdown_function_entry->fci;
 
-	zend_fcall_info_args_clear(&shutdown_function_entry->fci, true);
-	fci_release(&shutdown_function_entry->fci, &shutdown_function_entry->fci_cache);
+	if (fci) {
+		zend_fcall_info_args_clear(fci, true);
+		fci_release(fci, &shutdown_function_entry->fci_cache);
+	}
 	efree(shutdown_function_entry);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1582,9 +1582,12 @@ static void fci_release(zend_fcall_info fci, zend_fcall_info_cache fci_cache)`
`1582`	`1582`	`void user_shutdown_function_dtor(zval zv) / {{{ */`
`1583`	`1583`	`{`
`1584`	`1584`	`php_shutdown_function_entry *shutdown_function_entry = Z_PTR_P(zv);`
	`1585`	`+ zend_fcall_info *fci = &shutdown_function_entry->fci;`
`1585`	`1586`
`1586`		`- zend_fcall_info_args_clear(&shutdown_function_entry->fci, true);`
`1587`		`- fci_release(&shutdown_function_entry->fci, &shutdown_function_entry->fci_cache);`
	`1587`	`+ if (fci) {`
	`1588`	`+ zend_fcall_info_args_clear(fci, true);`
	`1589`	`+ fci_release(fci, &shutdown_function_entry->fci_cache);`
	`1590`	`+ }`
`1588`	`1591`	`efree(shutdown_function_entry);`
`1589`	`1592`	`}`
`1590`	`1593`	`/* }}} */`