summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2005-03-19 14:25:42 +0000
committerMarcus Boerger <helly@php.net>2005-03-19 14:25:42 +0000
commit32c2e664a6ecec122510170c15328ed6d6ff9bf3 (patch)
treeb93b2ed38cd73fe8d34f0a1f36f6778cbbcfc89b
parente38141478a8ca39f10a24ea8ddbbb3b733f97768 (diff)
downloadphp-git-32c2e664a6ecec122510170c15328ed6d6ff9bf3.tar.gz
- Fix all incarnations of bug #30266
# most probably we should emit a fatal error here but that has to be # discussed first
-rw-r--r--Zend/zend_execute_API.c4
1 files changed, 4 insertions, 0 deletions
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 */