- 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)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 8bfa7a0d418c17cbb9ef7618309f61f6da267164..377f096838409a1b03346ce86e5664f46a93b76f 100644 (file)
--- 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;
        }