Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit d13b3b6aa7fa · 2023-01-09T09:51:00.000+03:00
* PHP-8.1: ext/opcache/jit/zend_jit_trace: fix memory leak in _compile_root_trace() (#10146)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -7103,6 +7103,7 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
 			    if (t->stack_map_size) {
 					zend_jit_trace_stack *shared_stack_map = (zend_jit_trace_stack*)zend_shared_alloc(t->stack_map_size * sizeof(zend_jit_trace_stack));
 					if (!shared_stack_map) {
+						efree(t->stack_map);
 						ret = ZEND_JIT_TRACE_STOP_NO_SHM;
 						goto exit;
 					}

Original file line number	Diff line number	Diff line change
`@@ -7103,6 +7103,7 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace`
`7103`	`7103`	`if (t->stack_map_size) {`
`7104`	`7104`	`zend_jit_trace_stack shared_stack_map = (zend_jit_trace_stack)zend_shared_alloc(t->stack_map_size * sizeof(zend_jit_trace_stack));`
`7105`	`7105`	`if (!shared_stack_map) {`
	`7106`	`+ efree(t->stack_map);`
`7106`	`7107`	`ret = ZEND_JIT_TRACE_STOP_NO_SHM;`
`7107`	`7108`	`goto exit;`
`7108`	`7109`	`}`