diff options
| author | Nikita Popov <nikic@php.net> | 2012-03-24 12:52:15 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-09-22 21:46:02 +0200 |
| commit | c815dd74bc42c8f36ba35b910f45e85a645d7e3d (patch) | |
| tree | daaa7767a88fb50e42e87100ec024b9bd5052c40 | |
| parent | 4954aba2edbc4e29b8b18837298016b435ff7968 (diff) | |
| download | php-git-c815dd74bc42c8f36ba35b910f45e85a645d7e3d.tar.gz | |
Allow resetting the error handler
This allows the error handler to be reset using set_error_handler(null).
As the code suggests this behavior was already previously intended, but
the callback check was done too strictly.
| -rw-r--r-- | Zend/tests/bug60738.phpt | 17 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 14 |
2 files changed, 25 insertions, 6 deletions
diff --git a/Zend/tests/bug60738.phpt b/Zend/tests/bug60738.phpt new file mode 100644 index 0000000000..e0c9793fed --- /dev/null +++ b/Zend/tests/bug60738.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #60738 Allow 'set_error_handler' to handle NULL +--FILE-- +<?php + +set_error_handler(function() { echo 'Intercepted error!', "\n"; }); + +trigger_error('Error!'); + +set_error_handler(null); + +trigger_error('Error!'); +?> +--EXPECTF-- +Intercepted error! + +Notice: Error! in %s on line %d diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index eab98ed944..204c7d3d0b 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1520,13 +1520,15 @@ ZEND_FUNCTION(set_error_handler) 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", - get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name:"unknown"); + if (Z_TYPE_P(error_handler) != IS_NULL) { /* NULL == unset */ + 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", + get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name:"unknown"); + efree(error_handler_name); + return; + } efree(error_handler_name); - return; } - efree(error_handler_name); if (EG(user_error_handler)) { had_orig_error_handler = 1; @@ -1538,7 +1540,7 @@ ZEND_FUNCTION(set_error_handler) } ALLOC_ZVAL(EG(user_error_handler)); - if (!zend_is_true(error_handler)) { /* unset user-defined handler */ + if (Z_TYPE_P(error_handler) == IS_NULL) { /* unset user-defined handler */ FREE_ZVAL(EG(user_error_handler)); EG(user_error_handler) = NULL; RETURN_TRUE; |