cvs: ZendEngine2 / zend_execute.c zend_vm_def.h zend_vm_execute.h /tests bug35017.phpt

dmitry Mon Oct 31 14:29:48 2005 EDT Modified files: /ZendEngine2 zend_execute.c zend_vm_def.h zend_vm_execute.h /ZendEngine2/tests bug35017.phpt Log: Fixed bug #35017 (Exception thrown in error handler may cause unexpected behavior)

http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.723&r2=1.724&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.723 ZendEngine2/zend_execute.c:1.724 --- ZendEngine2/zend_execute.c:1.723 Mon Sep 19 03:23:44 2005 +++ ZendEngine2/zend_execute.c Mon Oct 31 14:29:45 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.723 2005/09/19 07:23:44 dmitry Exp $ */ +/* $Id: zend_execute.c,v 1.724 2005/10/31 19:29:45 dmitry Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -1473,6 +1473,11 @@ CHECK_SYMBOL_TABLES() \ EX(opline) = new_op +#define ZEND_VM_JMP(new_op) \ + CHECK_SYMBOL_TABLES() \ + EX(opline) = EG(exception)?EX(opline)+1:new_op; \ + ZEND_VM_CONTINUE() + #define ZEND_VM_INC_OPCODE() \ if (!EG(exception)) { \ CHECK_SYMBOL_TABLES() \ @@ -1490,9 +1495,6 @@ EG(current_execute_data) = EX(prev_execute_data); \ ZEND_VM_RETURN() -#define ZEND_VM_CONTINUE_JMP() \ - ZEND_VM_CONTINUE() - #include "zend_vm_execute.h" ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, opcode_handler_t handler) http://cvs.php.net/diff.php/ZendEngine2/zend_vm_def.h?r1=1.85&r2=1.86&ty=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.85 ZendEngine2/zend_vm_def.h:1.86 --- ZendEngine2/zend_vm_def.h:1.85 Fri Oct 28 02:05:37 2005 +++ ZendEngine2/zend_vm_def.h Mon Oct 31 14:29:45 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.85 2005/10/28 06:05:37 dmitry Exp $ */ +/* $Id: zend_vm_def.h,v 1.86 2005/10/31 19:29:45 dmitry Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -1457,8 +1457,7 @@ #if DEBUG_ZEND>=2 printf("Conditional jmp to %d\n", opline->op2.u.opline_num); #endif - ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(opline->op2.u.jmp_addr); } ZEND_VM_NEXT_OPCODE(); @@ -1475,8 +1474,7 @@ #if DEBUG_ZEND>=2 printf("Conditional jmp to %d\n", opline->op2.u.opline_num); #endif - ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(opline->op2.u.jmp_addr); } ZEND_VM_NEXT_OPCODE(); @@ -1493,14 +1491,12 @@ #if DEBUG_ZEND>=2 printf("Conditional jmp on true to %d\n", opline->extended_value); #endif - ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]); - ZEND_VM_CONTINUE(); /* CHECK_ME */ + ZEND_VM_JMP(&EX(op_array)->opcodes[opline->extended_value]); } else { #if DEBUG_ZEND>=2 printf("Conditional jmp on false to %d\n", opline->op2.u.opline_num); #endif - ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.u.opline_num]); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(&EX(op_array)->opcodes[opline->op2.u.opline_num]); } } @@ -1517,8 +1513,7 @@ #if DEBUG_ZEND>=2 printf("Conditional jmp to %d\n", opline->op2.u.opline_num); #endif - ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(opline->op2.u.jmp_addr); } ZEND_VM_NEXT_OPCODE(); } @@ -1536,8 +1531,7 @@ #if DEBUG_ZEND>=2 printf("Conditional jmp to %d\n", opline->op2.u.opline_num); #endif - ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(opline->op2.u.jmp_addr); } ZEND_VM_NEXT_OPCODE(); } @@ -2372,26 +2366,24 @@ { zend_op *opline = EX(opline); zend_free_op free_op2; + zend_brk_cont_element *el; - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + - zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), - opline->op1.u.opline_num, - EX(op_array), EX(Ts) TSRMLS_CC)->brk); + el = zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), opline->op1.u.opline_num, + EX(op_array), EX(Ts) TSRMLS_CC); FREE_OP2(); - ZEND_VM_CONTINUE(); /* CHECK_ME */ + ZEND_VM_JMP(EX(op_array)->opcodes + el->brk); } ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST|TMP|VAR|CV) { zend_op *opline = EX(opline); zend_free_op free_op2; + zend_brk_cont_element *el; - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + - zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), - opline->op1.u.opline_num, - EX(op_array), EX(Ts) TSRMLS_CC)->cont); + el = zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), opline->op1.u.opline_num, + EX(op_array), EX(Ts) TSRMLS_CC); FREE_OP2(); - ZEND_VM_CONTINUE(); /* CHECK_ME */ + ZEND_VM_JMP(EX(op_array)->opcodes + el->cont); } ZEND_VM_HANDLER(48, ZEND_CASE, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) @@ -2461,8 +2453,7 @@ } else { zval_ptr_dtor(&object_zval); } - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes + opline->op2.u.opline_num); } else { SELECTIVE_PZVAL_LOCK(object_zval, &opline->result); EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr; @@ -3061,8 +3052,7 @@ } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) { if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) { zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class"); - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); } ce = Z_OBJCE_PP(array_ptr_ptr); @@ -3160,8 +3150,7 @@ FREE_OP1_IF_VAR(); } if (is_empty) { - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); } else { ZEND_VM_NEXT_OPCODE(); } @@ -3187,8 +3176,7 @@ default: case ZEND_ITER_INVALID: zend_error(E_WARNING, "Invalid argument supplied for foreach()"); - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); case ZEND_ITER_PLAIN_OBJECT: { char *class_name, *prop_name; @@ -3198,8 +3186,7 @@ do { if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) { /* reached end of iteration */ - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); } key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL); @@ -3223,8 +3210,7 @@ fe_ht = HASH_OF(array); if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) { /* reached end of iteration */ - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); } if (use_key) { key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 1, NULL); @@ -3251,8 +3237,7 @@ zval_ptr_dtor(&array); ZEND_VM_NEXT_OPCODE(); } - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); } iter->funcs->get_current_data(iter, &value TSRMLS_CC); if (EG(exception)) { @@ -3262,8 +3247,7 @@ } if (!value) { /* failure in get_current_data */ - ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); - ZEND_VM_CONTINUE_JMP(); + ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num); } if (use_key) { if (iter->funcs->get_current_key) { http://cvs.php.net/diff.php/ZendEngine2/zend_vm_execute.h?r1=1.88&r2=1.89&ty=u http://cvs.php.net/diff.php/ZendEngine2/tests/bug35017.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug35017.phpt diff -u /dev/null ZendEngine2/tests/bug35017.phpt:1.2 --- /dev/null Mon Oct 31 14:29:48 2005 +++ ZendEngine2/tests/bug35017.phpt Mon Oct 31 14:29:48 2005 @@ -0,0 +1,21 @@ +--TEST-- +Bug #35017 (Exception thrown in error handler may cause unexpected behavior) +--FILE-- +<?php +set_error_handler('errorHandler'); +try { + if ($a) { + echo "1\n"; + } else { + echo "0\n"; + } + echo "?\n"; +} catch(Exception $e) { + echo "This Exception should be catched\n"; +} +function errorHandler($errno, $errstr, $errfile, $errline, $vars) { + throw new Exception('Some Exception'); +} +?> +--EXPECT-- +This Exception should be catched