msvcrt: Return error in mbstowcs if conversion fails.

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

msvcrt: Return error in mbstowcs if conversion fails.
7efd0c2c · Piotr Caban · Alexandre Julliard · 5310f969 · 7efd0c2c
Commit 7efd0c2c authored Jun 14, 2016 by Piotr Caban Committed by Alexandre Julliard Jun 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

mbcs.c dlls/msvcrt/mbcs.c +5 -0

No files found.
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2266,6 +2266,11 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr,

    size = MultiByteToWideChar(locinfo->lc_codepage, 0,
            mbstr, size, wcstr, count);
+    if(!size) {
+        if(count) wcstr[0] = '\0';
+        *MSVCRT__errno() = MSVCRT_EILSEQ;
+        return -1;
+    }

    if(size<count && wcstr)
        wcstr[size] = '\0';