From 3c6fd350074346af16324322d7d1605e6bf5670f Mon Sep 17 00:00:00 2001 From: Sterling Hughes Date: Tue, 20 May 2003 18:18:56 +0000 Subject: [PATCH] initialize these to NULL --- ext/standard/array.c | 2 +- ext/standard/basic_functions.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 01187f3871..2b0e36a4de 100644 --- 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; diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index ed069b04a2..edcdabf5c8 100644 --- 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; -- 2.50.1