From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 23 Aug 2016 09:58:46 +0000 (+0300)
Subject: Don't keep dangling pointers.
X-Git-Tag: php-7.1.0RC1~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76707dc20418b3922d81de1166679587fcb66eb2;p=php

Don't keep dangling pointers.
---

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 113a1a5f83..3092b9635f 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -947,12 +947,15 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
 			func_info = ZEND_FUNC_INFO(call_graph.op_arrays[i]);
 			if (func_info && func_info->ssa.var_info) {
 				zend_redo_pass_two_ex(call_graph.op_arrays[i], &func_info->ssa);
-				ZEND_SET_FUNC_INFO(call_graph.op_arrays[i], NULL);
 			} else {
 				zend_redo_pass_two(call_graph.op_arrays[i]);
 			}
 		}
 
+		for (i = 0; i < call_graph.op_arrays_count; i++) {
+			ZEND_SET_FUNC_INFO(call_graph.op_arrays[i], NULL);
+		}
+
 		zend_arena_release(&ctx.arena, checkpoint);
 	} else
 #endif