Patch set_error_handler-allow-null-parameter-corrected for Unknown/Other Function Bug #60738

Patch version 2012-03-11 07:46 UTC

Obsoleted by patches:

• error_handler_patch_1.diff, revision 2012-03-23 20:50 UTC

Obsolete patches:

• set_error_handler-allow-null-parameter, revision 2012-03-10 22:34 UTC

• 2012-03-11 07:46 UTC [diff to current]

Developer: kevin.swinton@gmail.com

Index: Zend/zend_builtin_functions.c
===================================================================
--- Zend/zend_builtin_functions.c	(revision 324092)
+++ Zend/zend_builtin_functions.c	(working copy)
@@ -1520,8 +1520,8 @@
 		return;
 	}
 
-	if (!zend_is_callable(error_handler, 0, &error_handler_name TSRMLS_CC)) {
-		zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback",
+	if ( Z_TYPE_P(error_handler) != IS_NULL && !zend_is_callable(error_handler, 0, &error_handler_name TSRMLS_CC)) {
+		zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback or null",
 				   get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name:"unknown");
 		efree(error_handler_name);
 		return;