diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-07-14 19:58:16 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-07-14 19:58:16 +0000 |
| commit | bf216dcad6ff26bc9c160402da639fdc89614fb4 (patch) | |
| tree | 72982fc55a8dfc7d988eca8f35d169addab11a6c | |
| parent | 88d1b6df9404ee846a455fffb7bef7623010b1aa (diff) | |
| download | cygnal-bf216dcad6ff26bc9c160402da639fdc89614fb4.tar.gz cygnal-bf216dcad6ff26bc9c160402da639fdc89614fb4.tar.bz2 cygnal-bf216dcad6ff26bc9c160402da639fdc89614fb4.zip | |
* miscfuncs.cc (cygwin_strncasecmp): Fix bug which results in
prematurely truncated strings. Simplify target length argument to
sys_mbstowcs.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/miscfuncs.cc | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7bbf33add..0953c1849 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2008-07-14 Corinna Vinschen <corinna@vinschen.de> + * miscfuncs.cc (cygwin_strncasecmp): Fix bug which results in + prematurely truncated strings. Simplify target length argument to + sys_mbstowcs. + +2008-07-14 Corinna Vinschen <corinna@vinschen.de> + * autoload.cc (GetExtendedTcpTable): Define. * fhandler_socket.cc (address_in_use): Take const struct sockaddr pointer as argument. Implement additional AF_INET6 table check. diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc index aff357d1a..845575edf 100644 --- a/winsup/cygwin/miscfuncs.cc +++ b/winsup/cygwin/miscfuncs.cc @@ -130,16 +130,14 @@ cygwin_strncasecmp (const char *cs, const char *ct, size_t n) while (cs[ls] && ls < n) ++ls; - len = ls * sizeof (WCHAR); + len = (ls + 1) * sizeof (WCHAR); RtlInitEmptyUnicodeString (&us, (PWCHAR) alloca (len), len); - us.Length = sys_mbstowcs (us.Buffer, us.MaximumLength / sizeof (WCHAR), - cs, ls) * sizeof (WCHAR); + us.Length = sys_mbstowcs (us.Buffer, ls + 1, cs, ls) * sizeof (WCHAR); while (ct[lt] && lt < n) ++lt; - len = lt * sizeof (WCHAR); + len = (lt + 1) * sizeof (WCHAR); RtlInitEmptyUnicodeString (&ut, (PWCHAR) alloca (len), len); - ut.Length = sys_mbstowcs (ut.Buffer, ut.MaximumLength / sizeof (WCHAR), - ct, lt) * sizeof (WCHAR); + ut.Length = sys_mbstowcs (ut.Buffer, lt + 1, ct, lt) * sizeof (WCHAR); return RtlCompareUnicodeString (&us, &ut, TRUE); } |