From f639c237a19cb79c39af1fc552e336d504af0bad Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Mon, 24 Sep 2018 09:57:51 +0200
Subject: Added check for not going beyond the string lenght

---
 src/lib/ndpi_main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/lib/ndpi_main.c')

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 84a1de400..2c546d47d 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -5703,7 +5703,7 @@ char* ndpi_strnstr(const char *s, const char *find, size_t slen) {
   size_t len;
 
   if((c = *find++) != '\0') {
-    len = strlen(find);
+    len = strnlen(find, slen);
     do {
       do {
 	if(slen-- < 1 || (sc = *s++) == '\0')
@@ -5711,10 +5711,11 @@ char* ndpi_strnstr(const char *s, const char *find, size_t slen) {
       } while (sc != c);
       if(len > slen)
 	return (NULL);
-    } while (strncmp(s, find, len) != 0);
+    } while(strncmp(s, find, len) != 0);
     s--;
   }
-  return ((char *)s);
+  
+  return((char *)s);
 }
 
 /* ****************************************************** */
-- 
cgit v1.2.3