Backport from xs.

1 files changed, 2 insertions, 1 deletions

diff --git a/xs.h b/xs.h
index 3758c8d..b1e2cec 100644
--- a/xs.h
+++ b/xs.h
@@ -914,7 +914,8 @@ void *xs_memmem(const char *haystack, int h_size, const char *needle, int n_size
     char *p, *r = NULL;
     int offset = 0;
 
-    while (!r && h_size - offset > n_size && (p = strchr(haystack + offset, *needle))) {
+    while (!r && h_size - offset > n_size &&
+           (p = memchr(haystack + offset, *needle, h_size - offset))) {
         if (memcmp(p, needle, n_size) == 0)
             r = p;
         else