From ad998356dd0d0f1c75a8327b6b556a03f93b6e59 Mon Sep 17 00:00:00 2001 From: Go Kudo Date: Sat, 17 Aug 2024 02:57:42 +0900 Subject: [PATCH 1/3] [ci skip] Update NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 890e67592cc..6017bc1f980 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 8.2.24 +- Core: + . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer). + (zeriyoshi) 29 Aug 2024, PHP 8.2.23 From bd843d760f13311c6f1d2dc3f008be4fadafafe0 Mon Sep 17 00:00:00 2001 From: Go Kudo Date: Sat, 17 Aug 2024 03:12:32 +0900 Subject: [PATCH 2/3] [ci skip] fix NEWS --- NEWS | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 6017bc1f980..d845ea39635 100644 --- a/NEWS +++ b/NEWS @@ -2,13 +2,11 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 8.2.24 -- Core: - . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer). - (zeriyoshi) - 29 Aug 2024, PHP 8.2.23 - Core: + . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer). + (zeriyoshi) . Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c). (nielsdos) . Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c). (nielsdos) From 836e6fa90077d2b0648eb301c3321652874380bb Mon Sep 17 00:00:00 2001 From: Go Kudo Date: Sat, 17 Aug 2024 05:20:04 +0900 Subject: [PATCH 3/3] zend_max_execution_timer: fix gcc compatibility (#15447) --- Zend/zend_max_execution_timer.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Zend/zend_max_execution_timer.c b/Zend/zend_max_execution_timer.c index 6ab2c0892c0..6cd2300d3ff 100644 --- a/Zend/zend_max_execution_timer.c +++ b/Zend/zend_max_execution_timer.c @@ -24,13 +24,14 @@ #include #include +#include "zend.h" +#include "zend_globals.h" +#include "zend_portability.h" + #if __has_feature(memory_sanitizer) # include #endif -#include "zend.h" -#include "zend_globals.h" - // Musl Libc defines this macro, glibc does not // According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417 # ifndef sigev_notify_thread_id @@ -53,8 +54,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */ #if __has_feature(memory_sanitizer) /* MSan does not intercept timer_create() */ - __msan_unpoison(&EG(max_execution_timer_timer), - sizeof(EG(max_execution_timer_timer))); + __msan_unpoison(&EG(max_execution_timer_timer), + sizeof(EG(max_execution_timer_timer))); #endif // Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727