diff options
| author | Marcus Boerger <helly@php.net> | 2008-08-08 13:21:52 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-08-08 13:21:52 +0000 |
| commit | 5a59d41305d5ed52f1fc69765b77b477c88ed7ea (patch) | |
| tree | 96115e0636f1ea9b4066be6576f4dea39b2542ba | |
| parent | 3b2da467e75bc7a26db4a138139c071580f79b91 (diff) | |
| download | php-git-5a59d41305d5ed52f1fc69765b77b477c88ed7ea.tar.gz | |
- MFH store error handling mode on stack when executing internal
or overloaded functions and methods. [...]
| -rw-r--r-- | Zend/zend_execute_API.c | 11 | ||||
| -rw-r--r-- | main/php.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 21c5c8b525..343c0f18c2 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -890,12 +890,16 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS EG(opline_ptr) = original_opline_ptr; } else if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) { int call_via_handler = (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0; + zend_error_handling_t error_handling = EG(error_handling); + zend_class_entry *exception_class = EG(exception_class); ALLOC_INIT_ZVAL(*fci->retval_ptr_ptr); if (EX(function_state).function->common.scope) { EG(scope) = EX(function_state).function->common.scope; } ((zend_internal_function *) EX(function_state).function)->handler(fci->param_count, *fci->retval_ptr_ptr, fci->retval_ptr_ptr, (fci->object_pp?*fci->object_pp:NULL), 1 TSRMLS_CC); + EG(error_handling) = error_handling; + EG(exception_class) = exception_class; /* We shouldn't fix bad extensions here, because it can break proper ones (Bug #34045) if (!EX(function_state).function->common.return_reference) @@ -912,12 +916,15 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS fci_cache->initialized = 0; } } else { /* ZEND_OVERLOADED_FUNCTION */ - ALLOC_INIT_ZVAL(*fci->retval_ptr_ptr); - /* Not sure what should be done here if it's a static method */ + /* Not sure what should be done here if it's a static method */ if (fci->object_pp) { + zend_error_handling_t error_handling = EG(error_handling); + zend_class_entry *exception_class = EG(exception_class); Z_OBJ_HT_PP(fci->object_pp)->call_method(EX(function_state).function->common.function_name, fci->param_count, *fci->retval_ptr_ptr, fci->retval_ptr_ptr, *fci->object_pp, 1 TSRMLS_CC); + EG(error_handling) = error_handling; + EG(exception_class) = exception_class; } else { zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object"); } diff --git a/main/php.h b/main/php.h index 421af2214c..611f2e6dc1 100644 --- a/main/php.h +++ b/main/php.h @@ -288,7 +288,7 @@ END_EXTERN_C() BEGIN_EXTERN_C() PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry *exception_class TSRMLS_DC); -#define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC) +static ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {} PHPAPI void php_verror(const char *docref, const char *params, int type, const char *format, va_list args TSRMLS_DC) PHP_ATTRIBUTE_FORMAT(printf, 4, 0); |