Fixed missaligned access

dstogov · dstogov · commit 4bbe55b25078 · 2020-11-09T11:50:26.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -422,9 +422,9 @@ static zend_always_inline void zend_jit_trace_add_op_guard(zend_ssa
 static zend_always_inline size_t zend_jit_trace_frame_size(const zend_op_array *op_array)
 {
 	if (op_array && op_array->type == ZEND_USER_FUNCTION) {
-		return offsetof(zend_jit_trace_stack_frame, stack) + ZEND_MM_ALIGNED_SIZE((op_array->last_var + op_array->T) * sizeof(zend_jit_trace_stack));
+		return ZEND_MM_ALIGNED_SIZE(offsetof(zend_jit_trace_stack_frame, stack) + ZEND_MM_ALIGNED_SIZE((op_array->last_var + op_array->T) * sizeof(zend_jit_trace_stack)));
 	} else {
-		return offsetof(zend_jit_trace_stack_frame, stack);
+		return ZEND_MM_ALIGNED_SIZE(offsetof(zend_jit_trace_stack_frame, stack));
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -422,9 +422,9 @@ static zend_always_inline void zend_jit_trace_add_op_guard(zend_ssa`
`422`	`422`	`static zend_always_inline size_t zend_jit_trace_frame_size(const zend_op_array *op_array)`
`423`	`423`	`{`
`424`	`424`	`if (op_array && op_array->type == ZEND_USER_FUNCTION) {`
`425`		`- return offsetof(zend_jit_trace_stack_frame, stack) + ZEND_MM_ALIGNED_SIZE((op_array->last_var + op_array->T) * sizeof(zend_jit_trace_stack));`
	`425`	`+ return ZEND_MM_ALIGNED_SIZE(offsetof(zend_jit_trace_stack_frame, stack) + ZEND_MM_ALIGNED_SIZE((op_array->last_var + op_array->T) * sizeof(zend_jit_trace_stack)));`
`426`	`426`	`} else {`
`427`		`- return offsetof(zend_jit_trace_stack_frame, stack);`
	`427`	`+ return ZEND_MM_ALIGNED_SIZE(offsetof(zend_jit_trace_stack_frame, stack));`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`