From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 14 Oct 2019 10:36:16 +0000 (+0300)
Subject: Drop checkpoint that leaded to use after free
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4273865bba5cb876af580010ec87eddd1485a396;p=php

Drop checkpoint that leaded to use after free
---

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index d5028bc3b2..aa638032ca 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -1375,7 +1375,6 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
 	    (ZEND_OPTIMIZER_PASS_7 & optimization_level) &&
 	    zend_build_call_graph(&ctx.arena, script, &call_graph) == SUCCESS) {
 		/* Optimize using call-graph */
-		void *checkpoint = zend_arena_checkpoint(ctx.arena);
 		int i;
 		zend_func_info *func_info;
 
@@ -1464,8 +1463,6 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
 		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 {
 		zend_optimize_op_array(&script->main_op_array, &ctx);