Fixed bug #23619 (set_error_handler() registered handler not called for object instan...

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 69921a1d60a260617eb99b2a88e24a1b8ad72e9b..b458724815adc1e5e327fd8d02cefa2d925bf750 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1027,11 +1027,17 @@ ZEND_FUNCTION(set_error_handler)
        }
        ALLOC_ZVAL(EG(user_error_handler));
 
-       if (Z_STRLEN_PP(error_handler)==0) { /* unset user-defined handler */
-               FREE_ZVAL(EG(user_error_handler));
-               EG(user_error_handler) = NULL;
-               RETURN_TRUE;
-       }
+#ifdef JANI_0
+    /*
+     * This part would never be reached unless there is something
+     * wrong with the engine as empty string can not be valid call back.
+     * See bug #23619 for more information why this is left here.
+     * (this only applies to non-debug-builds.)
+     */
+    if (Z_STRLEN_PP(error_handler)==0) { /* unset user-defined handler */
+        zend_error(E_ERROR, "%s(): This should never happen! '%s'", get_active_function_name(TSRMLS_C), error_handler);
+    }
+#endif
 
        *EG(user_error_handler) = **error_handler;
        zval_copy_ctor(EG(user_error_handler));