php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix set_error_handler()

Browse Source
This commit is contained in:
Zeev Suraski
2003-06-08 14:00:11 +00:00
parent f8fbb4a30b
commit 4abaac8c2f
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Zend/zend_builtin_functions.c
View File

@@ -964,17 +964,11 @@ ZEND_FUNCTION(set_error_handler)
}
ALLOC_ZVAL(EG(user_error_handler));
#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
if (!zend_is_true(*error_handler)) { /* unset user-defined handler */
FREE_ZVAL(EG(user_error_handler));
EG(user_error_handler) = NULL;
RETURN_TRUE;
}
*EG(user_error_handler) = **error_handler;
zval_copy_ctor(EG(user_error_handler));