From 400d4f283668a664d5bb3a3ecd5182e2eb3f06c5 Mon Sep 17 00:00:00 2001 From: Guillaume Chatelet Date: Fri, 29 Oct 2021 10:10:20 +0000 Subject: [PATCH] Fix CpuFeatures_memchr to actually use the provided size argument --- src/string_view.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/string_view.c b/src/string_view.c index d2317db..e05a8c5 100644 --- a/src/string_view.c +++ b/src/string_view.c @@ -20,9 +20,10 @@ #include "copy.h" #include "equals.h" -static const char* CpuFeatures_memchr(const char* ptr, size_t size, char c) { - for (; ptr && *ptr != '\0'; ++ptr) - if (*ptr == c) return ptr; +static const char* CpuFeatures_memchr(const char* const ptr, const size_t size, + const char c) { + for (size_t i = 0; ptr && ptr[i] != '\0' && i < size; ++i) + if (ptr[i] == c) return ptr + i; return NULL; }