From 2e286e73740faac64e695cc4e014f7a06905c980 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Wed, 8 Sep 2004 23:46:37 +0000 Subject: [PATCH] - Fix bug #28054 by preventing printing out bogus information in backtrace when in error handler (still doesn't know all information but at least it's not bogus) --- Zend/zend_builtin_functions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 8bfa7a0d418..377f0968384 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1621,7 +1621,7 @@ ZEND_FUNCTION(debug_print_backtrace) zval_ptr_dtor(&arg_array); } zend_printf(") called at [%s:%d]\n", filename, lineno); - include_filename = filename; + include_filename = function_name?NULL:filename; ptr = ptr->prev_execute_data; ++indent; } @@ -1766,7 +1766,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last TSRML add_next_index_zval(return_value, stack_frame); - include_filename = filename; + include_filename = function_name?NULL:filename; ptr = ptr->prev_execute_data; }