cvs: Zend / zend_builtin_functions.c

iliaa Wed Jan 8 11:40:22 2003 EDT Modified files: /Zend zend_builtin_functions.c Log: Fixed a crash in debug_print_backtrace(); Fixed a memory leak in debug_print_backtrace() patch by moriyoshi@php.net. Index: Zend/zend_builtin_functions.c diff -u Zend/zend_builtin_functions.c:1.132 Zend/zend_builtin_functions.c:1.133 --- Zend/zend_builtin_functions.c:1.132 Tue Dec 31 10:55:01 2002 +++ Zend/zend_builtin_functions.c Wed Jan 8 11:40:22 2003 @@ -1200,10 +1200,10 @@ int lineno; char *function_name; char *filename; - char *class_name; + char *class_name = NULL; char *call_type; char *include_filename = NULL; - zval *arg_array; + zval *arg_array = NULL; void **cur_arg_pos = EG(argument_stack).top_element; void **args = cur_arg_pos; int arg_stack_consistent = 0; @@ -1309,8 +1309,10 @@ ZEND_PUTS(call_type); } zend_printf("%s(", function_name?function_name:"main"); - debug_print_backtrace_args(arg_array); - ZVAL_DELREF(arg_array); + if (arg_array) { + debug_print_backtrace_args(arg_array); + zval_ptr_dtor(&arg_array); + } zend_printf(") called at [%s:%d]\n", filename, lineno); include_filename = filename; ptr = ptr->prev_execute_data;