fix #36878 (error messages are printed even though an exception has been thrown)

diff --git a/NEWS b/NEWS
index d6fb0e9d34e2a054005b259ae1f76d3155ea9890..6e9932c7d8902eaf2b1666733bc81297eea22068 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP                                                                        NEWS
 - Removed the E_STRICT deprecation notice from "var". (Ilia)
 - Fixed debug_zval_dump() to support private and protected members. (Dmitry)
 - Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36878 (error messages are printed even though an exception has 
+  been thrown). (Tony)
 - Fixed bug #36869 (memory leak in output buffering when using chunked output).
   (Tony)
 - Fixed bug #36859 (DOMElement crashes when calling __construct when 

diff --git a/Zend/zend.c b/Zend/zend.c
index bab26af0d63044ab9af0de8615de5a8397a18eec..366cd21c786f77f1c59811c19e6de1dc522b66b1 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1025,7 +1025,7 @@ ZEND_API void zend_error(int type, const char *format, ...)
                                        }
                                        zval_ptr_dtor(&retval);
                                }
-                       } else {
+                       } else if (!EG(exception)) {
                                /* The user error handler failed, use built-in error handler */
                                zend_error_cb(type, error_filename, error_lineno, format, args);
                        }