From: Andi Gutmans <andi@php.net>
Date: Wed, 8 Sep 2004 23:46:37 +0000 (+0000)
Subject: - Fix bug #28054 by preventing printing out bogus information in backtrace
X-Git-Tag: PRE_NEW_VM_GEN_PATCH~357
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e286e73740faac64e695cc4e014f7a06905c980;p=php

- 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 8bfa7a0d41..377f096838 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;
 	}