From 003dacb55156e7ee93fa619ca0fe308111c3e11e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 26 Aug 2013 21:36:16 +0000 Subject: [PATCH] [KERNEL32] * Check more parameters in MultiByteToWideChar() and WideCharToMultibyte(). By Marcus Boillat. * Fixes 4 kernel32:codepage tests. CORE-7411 #resolve #comment Committed in r59839 with formatting fixes. Thanks. svn path=/trunk/; revision=59839 --- reactos/dll/win32/kernel32/winnls/string/nls.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/reactos/dll/win32/kernel32/winnls/string/nls.c b/reactos/dll/win32/kernel32/winnls/string/nls.c index 8bfc515f162..c2981de30f6 100644 --- a/reactos/dll/win32/kernel32/winnls/string/nls.c +++ b/reactos/dll/win32/kernel32/winnls/string/nls.c @@ -1465,6 +1465,7 @@ MultiByteToWideChar(UINT CodePage, { /* Check the parameters. */ if (MultiByteString == NULL || + MultiByteCount == 0 || (WideCharString == NULL && WideCharCount > 0) || (PVOID)MultiByteString == (PVOID)WideCharString) { @@ -1899,6 +1900,7 @@ WideCharToMultiByte(UINT CodePage, { /* Check the parameters. */ if (WideCharString == NULL || + WideCharCount == 0 || (MultiByteString == NULL && MultiByteCount > 0) || (PVOID)WideCharString == (PVOID)MultiByteString || MultiByteCount < 0) @@ -1916,6 +1918,11 @@ WideCharToMultiByte(UINT CodePage, switch (CodePage) { case CP_UTF8: + if (DefaultChar != NULL || UsedDefaultChar != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } return IntWideCharToMultiByteUTF8(CodePage, Flags, WideCharString,