From: David Matejka <matej21@matej21.cz>
Date: Fri, 14 Apr 2017 22:20:06 +0000 (+0200)
Subject: Fixed bug #74444: multiple catch freezes in some cases
X-Git-Tag: php-7.1.5RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2135b057ec33bb480a10f642a3e42ba10364b81e;p=php

Fixed bug #74444: multiple catch freezes in some cases

zend_emit_jump() may reallocate, so reload the opline.
---

diff --git a/NEWS b/NEWS
index 6af7477ac6..c8c57bef08 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP                                                                        NEWS
     (Nikita)
   . Fixed bug #74188 (Null coalescing operator fails for undeclared static
     class properties). (tpunt)
+  . Fixed bug #74444 (multiple catch freezes in some cases). (David Matějka)
 
 - Date:
   . Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
diff --git a/Zend/tests/try/bug74444.phpt b/Zend/tests/try/bug74444.phpt
new file mode 100644
index 0000000000..838d12ef03
--- /dev/null
+++ b/Zend/tests/try/bug74444.phpt
@@ -0,0 +1,77 @@
+--TEST--
+Bug #74444 (multiple catch freezes in some cases)
+--FILE--
+<?php
+function foo()
+{
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	echo '';
+	try {
+		throw new \RuntimeException();
+	} catch (\FooEx  | \RuntimeException $e) {
+		echo 1;
+	}
+	echo 2;
+}
+
+foo();
+
+--EXPECT--
+12
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index d1d8ddcb8a..12e0630088 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4810,6 +4810,7 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 
 			if (!is_last_class) {
 				jmp_multicatch[j] = zend_emit_jump(0);
+				opline = &CG(active_op_array)->opcodes[opnum_catch];
 				opline->extended_value = get_next_op_number(CG(active_op_array));
 			}
 		}