summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2003-04-20 14:20:20 +0000
committerStanislav Malyshev <stas@php.net>2003-04-20 14:20:20 +0000
commitba02f60ee4cbb35c35214e56dc3bc1853cf7e353 (patch)
tree218bd4985f8ea12aece4cb64eaa4da1f355a8ece /Zend/zend_builtin_functions.c
parentfaafbd6edd95e77197f4f9a3eaec9600518baa66 (diff)
downloadphp-git-ba02f60ee4cbb35c35214e56dc3bc1853cf7e353.tar.gz
refine the set_error_handler fix
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index baeae401ef..82281c60a9 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -968,7 +968,7 @@ ZEND_FUNCTION(set_error_handler)
{
zval **error_handler;
zend_bool had_orig_error_handler=0;
- char *error_handler_name;
+ char *error_handler_name = NULL;
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &error_handler)==FAILURE) {
ZEND_WRONG_PARAM_COUNT();
@@ -976,7 +976,7 @@ ZEND_FUNCTION(set_error_handler)
if (!zend_is_callable(*error_handler, 0, &error_handler_name)) {
zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback",
- get_active_function_name(TSRMLS_C), error_handler_name);
+ get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name:"unknown");
efree(error_handler_name);
return;
}