- 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 200b61708ab2b9893f971e5e85583b8097b941e2..40ccb5e0fc6c3ff0e09209eb4d10facfb196b9a0 100644 (file)
--- 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 */