From f940c4df6ce63ac192a92ff931fd2fa61c0230db Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 4 Oct 2024 05:47:04 +0100 Subject: [PATCH] Zend stack on linux msan warning fix. --- Zend/zend_call_stack.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Zend/zend_call_stack.c b/Zend/zend_call_stack.c index ac12b8b7d8716..5e8f6fce4d5ce 100644 --- a/Zend/zend_call_stack.c +++ b/Zend/zend_call_stack.c @@ -77,6 +77,10 @@ typedef int boolean_t; # include #endif +#if __has_feature(memory_sanitizer) +# include +#endif + #ifdef ZEND_CHECK_STACK_LIMIT /* Called once per process or thread */ @@ -224,6 +228,11 @@ static bool zend_call_stack_get_linux_proc_maps(zend_call_stack *stack) } while (fgets(buffer, sizeof(buffer), f) && sscanf(buffer, "%" SCNxPTR "-%" SCNxPTR, &start, &end) == 2) { +#if __has_feature(memory_sanitizer) + /* Are initialised above */ + __msan_unpoison(&start, sizeof(start)); + __msan_unpoison(&end, sizeof(end)); +#endif if (start <= addr_on_stack && end >= addr_on_stack) { found = true; break;