strnstr: needle cannot be NULL

Chao-1412 · Oct 26, 2015 · 32adc07 · 32adc07
1 parent a2ee2cd
commit 32adc07
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/compat/strnstr.c b/compat/strnstr.c
@@ -23,13 +23,16 @@
 #endif
 
 #include <string.h>
+#include <assert.h>
 
 char * strnstr (const char *haystack, const char *needle, size_t len)
 {
-    if(!needle || !*needle)
-        return (char*)haystack;
+    assert(needle != NULL);
 
     const size_t i = strlen(needle);
+    if (i == 0) /* corner case (if haystack is NULL, memcmp not allowed) */
+        return (char *)haystack;
+
     if( len < i )
       return NULL;