msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.

Signed-off-by: Daniel Lehman <dlehman@esri.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.
eb37e2e4 · Daniel Lehman · Alexandre Julliard · 9aa7a42a · eb37e2e4 · eb37e2e4
Commit eb37e2e4 authored Aug 17, 2018 by Daniel Lehman Committed by Alexandre Julliard Aug 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

string.c dlls/msvcrt/string.c +2 -1

wcs.c dlls/msvcrt/wcs.c +2 -1

No files found.
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -694,7 +694,8 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t
    if(!locinfo->lc_handle[MSVCRT_LC_COLLATE])
        return strncasecmp(str1, str2, count);
    return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE,
-            str1, count, str2, count)-CSTR_EQUAL;
+            str1, MSVCRT_strnlen(str1, count),
+            str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL;
 }

 /*********************************************************************

--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -151,7 +151,8 @@ int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* 
    if(!locinfo->lc_handle[MSVCRT_LC_COLLATE])
        return strncmpiW(str1, str2, count);
    return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE,
-			  str1, count, str2, count)-CSTR_EQUAL;
+			  str1, MSVCRT_wcsnlen(str1, count),
+                          str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL;
 }

 /*********************************************************************