From 4b83f4a01144d6e3308604a5e3742305f8c10552 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 29 Apr 2013 10:45:31 +0400 Subject: [PATCH] Avoid possible conditional jump depended on uninitialised value --- ext/opcache/Optimizer/block_pass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 4dbb7c568d..b8c381406b 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -1257,14 +1257,15 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array) } cur_block = cur_block->next; } -#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO - if (opline[-1].opcode == ZEND_THROW) { + + if ((opline-1)->opcode == ZEND_THROW) { /* if we finished with THROW, we need to add space between THROW and HANDLE to not confuse zend_throw_internal */ MAKE_NOP(opline); opline->lineno = opline[-1].lineno; opline++; } +#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO MAKE_NOP(opline); opline->opcode = ZEND_HANDLE_EXCEPTION; opline->lineno = opline[-1].lineno; -- 2.40.0