From 3c7960cba19ed926b8e86b4c619e81c0f7da4d15 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Fri, 5 Nov 2021 15:09:45 -0700 Subject: [PATCH] [libFuzzer] Disable Msan on InternalStrnlen It's called from ATTRIBUTE_NO_SANITIZE_MEMORY code. It worked as expected if inlined and complained otherwise. Reviewed By: eugenis Differential Revision: https://reviews.llvm.org/D113323 --- compiler-rt/lib/fuzzer/FuzzerTracePC.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp b/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp index 53e3a69..af8d1ce 100644 --- a/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp +++ b/compiler-rt/lib/fuzzer/FuzzerTracePC.cpp @@ -391,6 +391,7 @@ void TracePC::HandleCmp(uintptr_t PC, T Arg1, T Arg2) { ValueProfileMap.AddValue(PC * 128 + 64 + AbsoluteDistance); } +ATTRIBUTE_NO_SANITIZE_MEMORY static size_t InternalStrnlen(const char *S, size_t MaxLen) { size_t Len = 0; for (; Len < MaxLen && S[Len]; Len++) {} @@ -399,6 +400,7 @@ static size_t InternalStrnlen(const char *S, size_t MaxLen) { // Finds min of (strlen(S1), strlen(S2)). // Needed because one of these strings may actually be non-zero terminated. +ATTRIBUTE_NO_SANITIZE_MEMORY static size_t InternalStrnlen2(const char *S1, const char *S2) { size_t Len = 0; for (; S1[Len] && S2[Len]; Len++) {} -- 2.7.4