diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-12-20 10:11:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-12-20 10:11:37 +0000 |
| commit | 39962e28d08da413853d9209f2b5dc46a394c5d8 (patch) | |
| tree | 6757f16ffffadfaaa9fd5ea8a94b1596f38a80db | |
| parent | 26b8429317e14bf9e329170910bb76268ca5243b (diff) | |
| download | cygnal-39962e28d08da413853d9209f2b5dc46a394c5d8.tar.gz cygnal-39962e28d08da413853d9209f2b5dc46a394c5d8.tar.bz2 cygnal-39962e28d08da413853d9209f2b5dc46a394c5d8.zip | |
* libc/memmem.cc (memmem): Fix bug when searching for empty string.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/libc/memmem.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fdd0298ec..afa9c9e69 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2007-12-20 Eric Blake <ebb9@byu.net> + + * libc/memmem.cc (memmem): Fix bug when searching for empty string. + 2007-12-19 Corinna Vinschen <corinna@vinschen.de> * cygwin.din: Export wcpcpy, wcpncpy. diff --git a/winsup/cygwin/libc/memmem.cc b/winsup/cygwin/libc/memmem.cc index cd9dc33d3..142b73333 100644 --- a/winsup/cygwin/libc/memmem.cc +++ b/winsup/cygwin/libc/memmem.cc @@ -45,8 +45,8 @@ memmem (const void *l, size_t l_len, const char *cs = (const char *)s; /* we need something to compare */ - if (l_len == 0 || s_len == 0) - return NULL; + if (s_len == 0) + return (void *) l; /* "s" must be smaller or equal to "l" */ if (l_len < s_len) |