Skip to content

W
wine-winehq
Commit 6a78f71f authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55959
parent 244b6356
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/msvcrt/mbcs.c
View file @ 6a78f71f
...@@ -1110,7 +1110,9 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si ...@@ -1110,7 +1110,9 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si
if(!mbcinfo->ismbcodepage) if(!mbcinfo->ismbcodepage)
return _strnicoll_l((const char*)str1, (const char*)str2, len, locale); return _strnicoll_l((const char*)str1, (const char*)str2, len, locale);
return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE,
(const char*)str1, strnlen((const char*)str1, len),
(const char*)str2, strnlen((const char*)str2, len)) - CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
...@@ -1156,7 +1158,9 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz ...@@ -1156,7 +1158,9 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz
if(!mbcinfo->ismbcodepage) if(!mbcinfo->ismbcodepage)
return _strncoll_l((const char*)str1, (const char*)str2, len, locale); return _strncoll_l((const char*)str1, (const char*)str2, len, locale);
return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; return CompareStringA(mbcinfo->mblcid, 0,
(const char*)str1, strnlen((const char*)str1, len),
(const char*)str2, strnlen((const char*)str2, len)) - CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment