initialize these to NULL

23 years ago · 3c6fd35007
2 changed files with 3 additions and 1 deletions
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@ -530,7 +530,7 @@ static int array_user_compare(const void *a, const void *b TSRMLS_DC)
 	args[0] = (zval **) f->pData;
 	args[1] = (zval **) s->pData;

-	if (fast_call_user_function(EG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL, &BG(user_compare_func_ptr) TSRMLS_CC) == SUCCESS
+	if (fast_call_user_function(EG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL, &BG(user_compare_func_ptr) TSRMLS_CC)== SUCCESS
 		&& retval_ptr) {
 		long retval;

--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@ -1012,6 +1012,8 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC)
 	BG(user_tick_functions) = NULL;
 	BG(aggregation_table) = NULL;
 	BG(user_filter_map) = NULL;
+	BG(user_compare_func_ptr) = NULL;
+	BG(array_walk_func_ptr) = NULL;
 	zend_hash_init(&BG(sm_protected_env_vars), 5, NULL, NULL, 1);
 	BG(sm_allowed_env_vars) = NULL;