From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 29 Apr 2013 06:45:31 +0000 (+0400)
Subject: Avoid possible conditional jump depended on uninitialised value
X-Git-Tag: php-5.5.0RC1~32^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b83f4a01144d6e3308604a5e3742305f8c10552;p=php

Avoid possible conditional jump depended on uninitialised value
---

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;