summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-02-25 12:44:26 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-02-25 12:44:26 +0100
commitb4c74c54b211008aa12eb115d827ed7e8752023e (patch)
tree7807cbd3360c638b001b75185898cac9a801d6b0
parent98ad4d3b5b7319e5d1f40573c88e4e010c529fe8 (diff)
parent1e50c81f6fbb1ff6dd40fc5f02919a3351978254 (diff)
downloadphp-git-b4c74c54b211008aa12eb115d827ed7e8752023e.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #63206: Fully support error/exception_handler stacking, even with null or inside the handler
-rw-r--r--Zend/tests/bug63206.phpt29
-rw-r--r--Zend/tests/bug63206_1.phpt26
-rw-r--r--Zend/tests/bug63206_2.phpt26
-rw-r--r--Zend/zend_builtin_functions.c10
4 files changed, 86 insertions, 5 deletions
diff --git a/Zend/tests/bug63206.phpt b/Zend/tests/bug63206.phpt
new file mode 100644
index 0000000000..dc7bb1fd1d
--- /dev/null
+++ b/Zend/tests/bug63206.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Bug #63206 Fully support error_handler stacking, even inside the error_handler
+--FILE--
+<?php
+
+set_error_handler(function() {
+ echo 'First handler' . PHP_EOL;
+});
+
+set_error_handler(function() {
+ echo 'Second handler' . PHP_EOL;
+
+ set_error_handler(function() {
+ echo 'Internal handler' . PHP_EOL;
+ });
+
+ $triggerInternalNotice++; // warnings while handling the error should go into internal handler
+
+ restore_error_handler();
+});
+
+$triggerNotice1++;
+$triggerNotice2++;
+?>
+--EXPECTF--
+Second handler
+Internal handler
+Second handler
+Internal handler
diff --git a/Zend/tests/bug63206_1.phpt b/Zend/tests/bug63206_1.phpt
new file mode 100644
index 0000000000..f08f913824
--- /dev/null
+++ b/Zend/tests/bug63206_1.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Bug #63206 Fully support error_handler stacking, even with null
+--FILE--
+<?php
+
+set_error_handler(function() {
+ echo 'First handler' . PHP_EOL;
+});
+
+set_error_handler(function() {
+ echo 'Second handler' . PHP_EOL;
+});
+
+set_error_handler(null);
+
+set_error_handler(function() {
+ echo 'Fourth handler' . PHP_EOL;
+});
+
+restore_error_handler();
+restore_error_handler();
+
+$triggerNotice++;
+?>
+--EXPECTF--
+Second handler
diff --git a/Zend/tests/bug63206_2.phpt b/Zend/tests/bug63206_2.phpt
new file mode 100644
index 0000000000..7a2bf38543
--- /dev/null
+++ b/Zend/tests/bug63206_2.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Bug #63206 Fully support exception_handler stacking, even with null
+--FILE--
+<?php
+
+set_exception_handler(function() {
+ echo 'First handler' . PHP_EOL;
+});
+
+set_exception_handler(function() {
+ echo 'Second handler' . PHP_EOL;
+});
+
+set_exception_handler(null);
+
+set_exception_handler(function() {
+ echo 'Fourth handler' . PHP_EOL;
+});
+
+restore_exception_handler();
+restore_exception_handler();
+
+throw new Exception();
+?>
+--EXPECTF--
+Second handler
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 2ec192c035..96a6b21ae2 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1396,11 +1396,11 @@ ZEND_FUNCTION(set_error_handler)
if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) {
ZVAL_COPY(return_value, &EG(user_error_handler));
-
- zend_stack_push(&EG(user_error_handlers_error_reporting), &EG(user_error_handler_error_reporting));
- zend_stack_push(&EG(user_error_handlers), &EG(user_error_handler));
}
+ zend_stack_push(&EG(user_error_handlers_error_reporting), &EG(user_error_handler_error_reporting));
+ zend_stack_push(&EG(user_error_handlers), &EG(user_error_handler));
+
if (Z_TYPE_P(error_handler) == IS_NULL) { /* unset user-defined handler */
ZVAL_UNDEF(&EG(user_error_handler));
return;
@@ -1460,10 +1460,10 @@ ZEND_FUNCTION(set_exception_handler)
if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
ZVAL_COPY(return_value, &EG(user_exception_handler));
-
- zend_stack_push(&EG(user_exception_handlers), &EG(user_exception_handler));
}
+ zend_stack_push(&EG(user_exception_handlers), &EG(user_exception_handler));
+
if (Z_TYPE_P(exception_handler) == IS_NULL) { /* unset user-defined handler */
ZVAL_UNDEF(&EG(user_exception_handler));
return;