diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index a368d0ac7f26..7bc7122b8596 100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -112,6 +112,10 @@ PHPAPI php_basic_globals basic_globals; #include "streamsfuncs.h" #include "basic_functions_arginfo.h" +#if __has_feature(memory_sanitizer) +# include +#endif + typedef struct _user_tick_function_entry { zend_fcall_info fci; zend_fcall_info_cache fci_cache; @@ -2263,6 +2267,10 @@ PHP_FUNCTION(getservbyport) RETURN_FALSE; } + /* MSAN false positive, getservbyport() is not properly intercepted. */ +#if __has_feature(memory_sanitizer) + __msan_unpoison_string(serv->s_name); +#endif RETURN_STRING(serv->s_name); } /* }}} */