cvs: ZendEngine2 / zend_builtin_functions.c

andi Wed Sep 8 19:46:37 2004 EDT Modified files: /ZendEngine2 zend_builtin_functions.c Log: - 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) http://cvs.php.net/diff.php/ZendEngine2/zend_builtin_functions.c?r1=1.245&r2=1.246&ty=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.245 ZendEngine2/zend_builtin_functions.c:1.246 --- ZendEngine2/zend_builtin_functions.c:1.245 Tue Aug 24 20:41:43 2004 +++ ZendEngine2/zend_builtin_functions.c Wed Sep 8 19:46:37 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.245 2004/08/25 00:41:43 andi Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.246 2004/09/08 23:46:37 andi Exp $ */ #include "zend.h" #include "zend_API.h" @@ -1621,7 +1621,7 @@ 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 @@ add_next_index_zval(return_value, stack_frame); - include_filename = filename; + include_filename = function_name?NULL:filename; ptr = ptr->prev_execute_data; }