diff options
| author | Felipe Pena <felipe@php.net> | 2010-03-07 02:17:11 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-03-07 02:17:11 +0000 |
| commit | f867fadd22a68b2d92c621d522842b285f41e4ad (patch) | |
| tree | 6b4d88bdadb6c2abfbea294ace3dfa581b38ac82 /Zend/zend_builtin_functions.c | |
| parent | 4149bb3dfd9c4fa67164099959feb8b819ae81da (diff) | |
| download | php-git-f867fadd22a68b2d92c621d522842b285f41e4ad.tar.gz | |
- Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include file and line in trace)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 4c96e19975..0807341f52 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -2148,7 +2148,9 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int while (prev) { if (prev->function_state.function && - prev->function_state.function->common.type != ZEND_USER_FUNCTION) { + prev->function_state.function->common.type != ZEND_USER_FUNCTION && + !(prev->function_state.function->common.type == ZEND_INTERNAL_FUNCTION && + (prev->function_state.function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER))) { break; } if (prev->op_array) { |