Commit: af20f1a4741ce1202e9463c37b13a15bf2db7a35 Author: krakjoe <joe.watk...@live.co.uk> Mon, 18 Nov 2013 23:48:10 +0000 Parents: 407ab7d57e5997b420e09b9aa2667d8fca794cde Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af20f1a4741ce1202e9463c37b13a15bf2db7a35 Log: fix memory errors when printing execution context Changed paths: M phpdbg_print.c Diff: diff --git a/phpdbg_print.c b/phpdbg_print.c index f3821be..ad54c05 100644 --- a/phpdbg_print.c +++ b/phpdbg_print.c @@ -41,10 +41,10 @@ static inline void phpdbg_print_function_helper(zend_function *method TSRMLS_DC) { switch (method->type) { case ZEND_USER_FUNCTION: { - zend_op_array* op_array = &method->op_array; + zend_op_array* op_array = &(method->op_array); if (op_array) { - zend_op *opline = &op_array->opcodes[0]; + zend_op *opline = &(op_array->opcodes[0]); zend_uint opcode = 0, end = op_array->last-1; @@ -58,7 +58,8 @@ static inline void phpdbg_print_function_helper(zend_function *method TSRMLS_DC) } else { phpdbg_writeln( "\t#%d-%d %s() %s", - op_array->line_start, op_array->line_end, + method->common.function_name ? op_array->line_start : 0, + method->common.function_name ? op_array->line_end : 0, method->common.function_name ? method->common.function_name : "{main}", op_array->filename ? op_array->filename : "unknown"); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
