From: Marcus Boerger <helly@php.net>
Date: Sat, 19 Mar 2005 14:25:42 +0000 (+0000)
Subject: - Fix all incarnations of bug #30266
X-Git-Tag: php-5.0.1b1~747
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32c2e664a6ecec122510170c15328ed6d6ff9bf3;p=php

- Fix all incarnations of bug #30266
# most probably we should emit a fatal error here but that has to be
# discussed first
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 200b61708a..40ccb5e0fc 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -575,6 +575,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 */