From c7c393169865843cd826ff37f217561ffae7c647 Mon Sep 17 00:00:00 2001 From: Egor Bogatov Date: Tue, 23 Aug 2022 17:37:33 +0200 Subject: [PATCH] Fix strnstr (#74421) --- src/coreclr/jit/jitconfig.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/coreclr/jit/jitconfig.cpp b/src/coreclr/jit/jitconfig.cpp index b74291ea837..cd65af36f10 100644 --- a/src/coreclr/jit/jitconfig.cpp +++ b/src/coreclr/jit/jitconfig.cpp @@ -323,6 +323,11 @@ void JitConfigValues::MethodSet::destroy(ICorJitHost* host) // strstr that is length-limited, this implementation is not intended to be used on hot paths static size_t strnstr(const char* pSrc, size_t srcSize, const char* needle, size_t needleSize) { + if (srcSize < needleSize) + { + return -1; + } + for (size_t srcPos = 0; srcPos <= srcSize - needleSize; srcPos++) { if (strncmp(pSrc + srcPos, needle, needleSize) == 0) -- GitLab