- MFH

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index ea38c03156be81d9e35d2e4c3acf762d7630e901..b2b459e4964bd6ac66215e4d9e4f0bc700542cd9 100644 (file)
--- 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 7e42c3b3af7f9228977e0d9457fa2d03c9b79a93..e65f8bd03a2bd7957a5c5a025dfe70e7fd745bf0 100644 (file)
--- 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;