From: Marcus Boerger <helly@php.net>
Date: Sat, 19 Mar 2005 14:29:18 +0000 (+0000)
Subject: - MFH
X-Git-Tag: php-5.0.4RC2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=582697ae5cd82a66b7af2be1a7b4e2f62e11f94a;p=php

- MFH
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index ea38c03156..b2b459e496 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -572,6 +572,10 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 	zval *params_array;
 	int call_via_handler = 0;
 
+	if (EG(exception)) {
+		return FAILURE; /* we would result in an instable executor otherwise */
+	}
+
 	switch (fci->size) {
 		case sizeof(zend_fcall_info):
 			break; /* nothing to do currently */
diff --git a/main/main.c b/main/main.c
index 7e42c3b3af..e65f8bd03a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -655,10 +655,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 	/* according to error handling mode, suppress error, throw exception or show it */
 	if (PG(error_handling) != EH_NORMAL) {
 		switch (type) {
-			case E_ERROR:
 			case E_CORE_ERROR:
 			case E_COMPILE_ERROR:
-			case E_USER_ERROR:
 			case E_PARSE:
 				/* fatal errors are real errors and cannot be made exceptions */
 				break;