[PATCH 0/1] MR4541: msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l.

[PATCH 1/1] msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l.

[Piotr Caban]

From: Piotr Caban

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55959
---
 dlls/msvcrt/mbcs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 2e228d77811..2cbab84546d 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -1110,7 +1110,8 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si

if(!mbcinfo->ismbcodepage)
         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(str1, len), (const char*)str2, strnlen(str2, len)) - CSTR_EQUAL;
 }

/*********************************************************************
@@ -1156,7 +1157,8 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz

if(!mbcinfo->ismbcodepage)
         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(str1, len), (const char*)str2, strnlen(str2, len)) - CSTR_EQUAL;
 }

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