cvs: ZendEngine2(PHP_5_3) / zend_vm_execute.h

dmitry Tue May 6 09:41:42 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_vm_execute.h Log: Regenerate zend_vm_execute.h http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.49.2.51&r2=1.62.2.30.2.49.2.52&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.51 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.52 --- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.51 Mon May 5 11:03:33 2008 +++ ZendEngine2/zend_vm_execute.h Tue May 6 09:41:39 2008 @@ -515,10 +515,14 @@ switch (brk_opline->opcode) { case ZEND_SWITCH_FREE: - zend_switch_free(&EX_T(brk_opline->op1.u.var), brk_opline->extended_value TSRMLS_CC); + if (brk_opline->op1.u.EA.type != EXT_TYPE_FREE_ON_RETURN) { + zend_switch_free(&EX_T(brk_opline->op1.u.var), brk_opline->extended_value TSRMLS_CC); + } break; case ZEND_FREE: - zendi_zval_dtor(EX_T(brk_opline->op1.u.var).tmp_var); + if (brk_opline->op1.u.EA.type != EXT_TYPE_FREE_ON_RETURN) { + zendi_zval_dtor(EX_T(brk_opline->op1.u.var).tmp_var); + } break; } } @@ -724,10 +728,14 @@ switch (brk_opline->opcode) { case ZEND_SWITCH_FREE: - zend_switch_free(&EX_T(brk_opline->op1.u.var), brk_opline->extended_value TSRMLS_CC); + if (brk_opline->op1.u.EA.type != EXT_TYPE_FREE_ON_RETURN) { + zend_switch_free(&EX_T(brk_opline->op1.u.var), brk_opline->extended_value TSRMLS_CC); + } break; case ZEND_FREE: - zendi_zval_dtor(EX_T(brk_opline->op1.u.var).tmp_var); + if (brk_opline->op1.u.EA.type != EXT_TYPE_FREE_ON_RETURN) { + zendi_zval_dtor(EX_T(brk_opline->op1.u.var).tmp_var); + } break; } ZEND_VM_JMP(opline->op1.u.jmp_addr);