diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-22 18:32:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-22 18:32:03 +0800 |
| commit | 60a29791e4b66844e5dfff698141074d48fc3da8 (patch) | |
| tree | 7b2df724455d4d152d2870161c8249b18b0b5f05 /Zend/zend_opcode.c | |
| parent | 3d4f91da4b6e1c4e918fa330782b9cae98334b11 (diff) | |
| download | php-git-60a29791e4b66844e5dfff698141074d48fc3da8.tar.gz | |
Fixed bug that jmp in try block jmp over finally block
Refactor the implemention, make codes clear
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 2552d2ebd6..6c15829100 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -87,7 +87,7 @@ void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_siz op_array->static_variables = NULL; op_array->last_try_catch = 0; - op_array->has_finally_block = 0; + op_array->has_finally_block = 0; op_array->this_var = -1; @@ -552,8 +552,8 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC) } opline->op1.jmp_addr = &op_array->opcodes[opline->op1.opline_num]; break; - case ZEND_BRK: - case ZEND_CONT: + case ZEND_BRK: + case ZEND_CONT: if (op_array->last_try_catch) { int nest_levels, array_offset; zend_brk_cont_element *jmp_to; |