com php-src: Properly cleanup in case of abort because too many functions in single trace.: ext/opcache/jit/zend_jit_trace.c
| From: | Dmitry Stogov | Date: | Mon, 27 Jul 2020 13:37:15 +0000 |
| Subject: | com php-src: Properly cleanup in case of abort because too many functions in single trace.: ext/opcache/jit/zend_jit_trace.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112380@lists.php.net to get a copy of this message | ||
Commit: 8d773a768f10313a8ea81a2af326b271019e28bb
Author: Dmitry Stogov <dmitry@zend.com> Mon, 27 Jul 2020 16:37:15 +0300
Parents: d66a6ba58a007737e0ab43c3a433007f57bfa035
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8d773a768f10313a8ea81a2af326b271019e28bb
Log:
Properly cleanup in case of abort because too many functions in single trace.
Changed paths:
M ext/opcache/jit/zend_jit_trace.c
Diff:
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 8af466c9e4..7ed9730320 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -1009,6 +1009,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer,
uin
/* pass */
} else if (num_op_arrays == ZEND_JIT_TRACE_MAX_FUNCS) {
/* Too many functions in single trace */
+ *num_op_arrays_ptr = num_op_arrays;
return NULL;
} else {
/* Remember op_array to cleanup */
@@ -1026,6 +1027,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer,
uin
/* pass */
} else if (num_op_arrays == ZEND_JIT_TRACE_MAX_FUNCS) {
/* Too many functions in single trace */
+ *num_op_arrays_ptr = num_op_arrays;
return NULL;
} else {
/* Remember op_array to cleanup */