From: Antony Dovgal <tony2001@php.net>
Date: Mon, 27 Mar 2006 22:07:38 +0000 (+0000)
Subject: fix #36878 (error messages are printed even though an exception has been thrown)
X-Git-Tag: php-5.1.3RC2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a93bd9d4931d04f3d560c9c2bdd3b6259b340540;p=php

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

diff --git a/NEWS b/NEWS
index d6fb0e9d34..6e9932c7d8 100644
--- 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 bab26af0d6..366cd21c78 100644
--- 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);
 			}