diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
| commit | 82ceeb2ea625cd9bff60f2863b9a0830f55b7905 (patch) | |
| tree | 263ca9347bf664a4489743f9302e699ce14de1df /lib/libc/string/memmem.c | |
| parent | 4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (diff) | |
| parent | d20dd8b36e7a565be7bfbb22aade51c8ffd753e9 (diff) | |
| download | FreeBSD-src-82ceeb2ea625cd9bff60f2863b9a0830f55b7905.zip FreeBSD-src-82ceeb2ea625cd9bff60f2863b9a0830f55b7905.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into develdevel
Diffstat (limited to 'lib/libc/string/memmem.c')
| -rw-r--r-- | lib/libc/string/memmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c index 72e6517..3fd05df 100644 --- a/lib/libc/string/memmem.c +++ b/lib/libc/string/memmem.c @@ -42,9 +42,9 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len) const char *cl = (const char *)l; const char *cs = (const char *)s; - /* we need something to compare */ - if (l_len == 0 || s_len == 0) - return NULL; + /* empty "s" matches the beginning of "l" */ + if (s_len == 0) + return (void *)cl; /* "s" must be smaller or equal to "l" */ if (l_len < s_len) |
