From: Stanislav Malyshev <stas@php.net>
Date: Sun, 20 Apr 2003 14:20:20 +0000 (+0000)
Subject: refine the set_error_handler fix
X-Git-Tag: SPL_ALPHA~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba02f60ee4cbb35c35214e56dc3bc1853cf7e353;p=php

refine the set_error_handler fix
---

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;
 	}