From 776b1aefc8557c8aacf3215c472f9abe0e57e825 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 6 May 2020 16:26:36 +0300 Subject: [PATCH] Careful cleanup --- ext/opcache/jit/zend_jit_trace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index a9170811ee9..996408229fa 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -2464,9 +2464,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par ssa = zend_jit_trace_build_tssa(trace_buffer, parent_trace, exit_num, script, op_arrays, &num_op_arrays); if (!ssa) { - zend_arena_release(&CG(arena), checkpoint); - JIT_G(current_trace) = NULL; - return NULL; + goto jit_cleanup; } /* Register allocation */ @@ -4023,6 +4021,7 @@ jit_failure: zend_string_release(name); } +jit_cleanup: /* Clenup used op_arrays */ while (num_op_arrays > 0) { op_array = op_arrays[--num_op_arrays];