diff options
| author | Sterling Hughes <sterling@php.net> | 2003-05-20 18:18:56 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2003-05-20 18:18:56 +0000 |
| commit | 3c6fd350074346af16324322d7d1605e6bf5670f (patch) | |
| tree | 8556a67f92473962f15a3671edca1941dbab4eab | |
| parent | 8571f5eac2d24c4866d81ceb50830e00d3a5363a (diff) | |
| download | php-git-3c6fd350074346af16324322d7d1605e6bf5670f.tar.gz | |
initialize these to NULL
| -rw-r--r-- | ext/standard/array.c | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
2 files changed, 3 insertions, 1 deletions
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; |