diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-31 11:54:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-31 11:54:08 +0800 |
| commit | b72fd9c25834056c83b6fba01a530af94075cbf8 (patch) | |
| tree | 76578434ed86e54fd7a9beeb57fc6897457dcd2d /Zend/zend_builtin_functions.c | |
| parent | fd1a7c5f2d55949ac5a407aa5acec6d240417b1f (diff) | |
| parent | 53a40386bc81da824468ac3aa8b1962ab7029238 (diff) | |
| download | php-git-b72fd9c25834056c83b6fba01a530af94075cbf8.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index b123cdab10..e131e97bee 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1698,6 +1698,10 @@ ZEND_FUNCTION(set_error_handler) Restores the previously defined error handler function */ ZEND_FUNCTION(restore_error_handler) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) { zval zeh; @@ -1760,6 +1764,10 @@ ZEND_FUNCTION(set_exception_handler) Restores the previously defined exception handler function */ ZEND_FUNCTION(restore_exception_handler) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) { zval_ptr_dtor(&EG(user_exception_handler)); } |