From 436b01e3797860add57a524b4492f8451b60ac68 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 6 Jul 2015 16:52:38 +0300 Subject: [PATCH] Avoid dangerous optimization --- ext/opcache/Optimizer/block_pass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index ee9bda6094..e1e07ea01b 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -762,7 +762,8 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array, */ if (opline->opcode == ZEND_IS_EQUAL || opline->opcode == ZEND_IS_NOT_EQUAL || - opline->opcode == ZEND_CASE) { + /* CASE variable will be deleted later by FREE, so we can't optimize it */ + (opline->opcode == ZEND_CASE && (ZEND_OP1_TYPE(opline) & (IS_CONST|IS_CV)))) { if (ZEND_OP1_TYPE(opline) == IS_CONST && (Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_FALSE || Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_TRUE)) { -- 2.50.1