Skip to content

Commit a93bd9d

Browse files
committed
fix #36878 (error messages are printed even though an exception has been thrown)
1 parent c5df143 commit a93bd9d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ PHP NEWS
1111
- Removed the E_STRICT deprecation notice from "var". (Ilia)
1212
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
1313
- Fixed SoapFault::getMessage(). (Dmitry)
14+
- Fixed bug #36878 (error messages are printed even though an exception has
15+
been thrown). (Tony)
1416
- Fixed bug #36869 (memory leak in output buffering when using chunked output).
1517
(Tony)
1618
- Fixed bug #36859 (DOMElement crashes when calling __construct when

Zend/zend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ ZEND_API void zend_error(int type, const char *format, ...)
10251025
}
10261026
zval_ptr_dtor(&retval);
10271027
}
1028-
} else {
1028+
} else if (!EG(exception)) {
10291029
/* The user error handler failed, use built-in error handler */
10301030
zend_error_cb(type, error_filename, error_lineno, format, args);
10311031
}

0 commit comments

Comments
 (0)