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

diff --git a/Zend/zend.c b/Zend/zend.c
index 695fe6bc56aac04af82198bc460b89573ed5f4d7..41662a39a99ddea7e50a252b0af187adffa9a9cc 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1474,7 +1474,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);
                        }