From 20c5da6e555c1f03d171785e65df94ee2f245d5f Mon Sep 17 00:00:00 2001 From: cpq Date: Tue, 28 Feb 2023 17:55:25 +0000 Subject: [PATCH] Fix build - NULL pointer check --- mongoose.c | 1 + src/str.c | 1 + 2 files changed, 2 insertions(+) diff --git a/mongoose.c b/mongoose.c index 6b258f5b..e946730f 100644 --- a/mongoose.c +++ b/mongoose.c @@ -4930,6 +4930,7 @@ const char *mg_strstr(const struct mg_str haystack, const struct mg_str needle) { size_t i; if (needle.len > haystack.len) return NULL; + if (needle.len == 0) return haystack.ptr; for (i = 0; i <= haystack.len - needle.len; i++) { if (memcmp(haystack.ptr + i, needle.ptr, needle.len) == 0) { return haystack.ptr + i; diff --git a/src/str.c b/src/str.c index 329a067d..20af52e7 100644 --- a/src/str.c +++ b/src/str.c @@ -74,6 +74,7 @@ const char *mg_strstr(const struct mg_str haystack, const struct mg_str needle) { size_t i; if (needle.len > haystack.len) return NULL; + if (needle.len == 0) return haystack.ptr; for (i = 0; i <= haystack.len - needle.len; i++) { if (memcmp(haystack.ptr + i, needle.ptr, needle.len) == 0) { return haystack.ptr + i;