Merge remote branch 'liu/master'syslinux-4.03-pre6

1 files changed, 27 insertions, 18 deletions

diff --git a/com32/lib/memmem.c b/com32/lib/memmem.c
index 8558a80d..7c42f1c3 100644
--- a/com32/lib/memmem.c
+++ b/com32/lib/memmem.c
@@ -18,26 +18,35 @@ void *memmem(const void *haystack, size_t n, const void *needle, size_t m)
 
     size_t j, k, l;
 
-    if (m > n)
-	return NULL;
+    if (m > n || !m || !n)
+        return NULL;
 
-    if (x[0] == x[1]) {
-	k = 2;
-	l = 1;
-    } else {
-	k = 1;
-	l = 2;
-    }
+    if (1 != m) {
+        if (x[0] == x[1]) {
+            k = 2;
+            l = 1;
+        } else {
+            k = 1;
+            l = 2;
+        }
 
-    j = 0;
-    while (j <= n - m) {
-	if (x[1] != y[j + 1]) {
-	    j += k;
-	} else {
-	    if (!memcmp(x + 2, y + j + 2, m - 2) && x[0] == y[j])
-		return (void *)&y[j];
-	    j += l;
-	}
+        j = 0;
+        while (j <= n - m) {
+            if (x[1] != y[j + 1]) {
+                j += k;
+            } else {
+                if (!memcmp(x + 2, y + j + 2, m - 2)
+                    && x[0] == y[j])
+                    return (void *)&y[j];
+                j += l;
+            }
+        }
+    } else {
+        do {
+            if (*y == *x)
+                return (void *)y;
+            y++;
+        } while (--n);
     }
 
     return NULL;