compat: fix strnstr

need to wake up sometimes :/
Chao-1412 · Oct 7, 2015 · db41ce0 · db41ce0
1 parent a140a68
commit db41ce0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/compat/strnstr.c b/compat/strnstr.c
@@ -26,18 +26,22 @@
 
 char * strnstr (const char *haystack, const char *needle, size_t len)
 {
+    if(!needle || !*needle)
+        return (char*)haystack;
+
     const size_t i = strlen(needle);
-    if( i < len )
+    if( len < i )
       return NULL;
 
     size_t count = len - i;
 
-    while(count)
+    do
     {
       if( memcmp(haystack, needle, i) )
         return (char*) haystack;
-      count--;
       haystack++;
     }
+    while(count--);
+
     return NULL;
 }