diff options
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 1ace606a7e..ad61ad6624 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3230,12 +3230,18 @@ check_func: } return 0; case IS_OBJECT: - if (Z_OBJ_HANDLER_P(callable, get_closure) && Z_OBJ_HANDLER_P(callable, get_closure)(Z_OBJ_P(callable), &fcc->calling_scope, &fcc->function_handler, &fcc->object) == SUCCESS) { + if (Z_OBJ_HANDLER_P(callable, get_closure)) { + if (Z_OBJ_HANDLER_P(callable, get_closure)(Z_OBJ_P(callable), &fcc->calling_scope, &fcc->function_handler, &fcc->object) == SUCCESS) { fcc->called_scope = fcc->calling_scope; if (fcc == &fcc_local) { zend_release_fcall_info_cache(fcc); } return 1; + } else { + /* Discard exceptions thrown from Z_OBJ_HANDLER_P(callable, get_closure) + TODO: extend get_closure() with additional argument and prevent exception throwing in the first place */ + zend_clear_exception(); + } } if (error) *error = estrdup("no array or string given"); return 0; |