php.net | support | documentation | report a bug | advanced search | search howto | statistics | random bug | login | |
Patch bug60738.patch for Unknown/Other Function Bug #60738Patch version 2012-03-24 04:17 UTC Return to Bug #60738 | Download this patchThis patch renders other patches obsolete Obsolete patches:
Developer: laruence@php.netdiff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index b55231d..e5ae594 100644 index 29f9ed3..f8d4674 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1512,7 +1512,6 @@ ZEND_FUNCTION(trigger_error) ZEND_FUNCTION(set_error_handler) - zend_bool had_orig_error_handler=0; char *error_handler_name = NULL; long error_type = E_ALL; @@ -1520,37 +1519,45 @@ ZEND_FUNCTION(set_error_handler) @@ -1520,37 +1519,40 @@ ZEND_FUNCTION(set_error_handler) return; } - if (!zend_is_callable(error_handler, 0, &error_handler_name TSRMLS_CC)) { Line 54 (now 54), was 11 lines, now 9 lines - RETURN_TRUE; - } + ALLOC_ZVAL(EG(user_error_handler)); + EG(user_error_handler_error_reporting) = (int)error_type; + *EG(user_error_handler) = *error_handler; + zval_copy_ctor(EG(user_error_handler)); + INIT_PZVAL(EG(user_error_handler)); + MAKE_COPY_ZVAL(&error_handler, EG(user_error_handler)); - EG(user_error_handler_error_reporting) = (int)error_type; - *EG(user_error_handler) = *error_handler; - zval_copy_ctor(EG(user_error_handler)); Line 67 (now 65), was 11 lines, now 8 lines + RETURN_NULL(); + } + } else { /* unset user-defined handler */ + if (EG(user_error_handler)) { + *return_value = *EG(user_error_handler); + zval_copy_ctor(return_value); + INIT_PZVAL(return_value); + zend_stack_push(&EG(user_error_handlers_error_reporting), &EG(user_error_handler_error_reporting), sizeof(EG(user_error_handler_error_reporting))); + zend_ptr_stack_push(&EG(user_error_handlers), EG(user_error_handler)); + } |
Copyright © 2001-2024 The PHP Group All rights reserved. |
Last updated: Fri Mar 29 11:01:29 2024 UTC |