Piotr Caban : msvcrt: Return error in mbstowcs if conversion fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7efd0c2c79e6d2773149d824da0aa136973f92f0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7efd0c2c79e6d2773149d824da...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Tue Jun 14 11:57:07 2016 +0200

msvcrt: Return error in mbstowcs if conversion fails.

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

---

 dlls/msvcrt/mbcs.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index d307399..5d389bf 100644
--- 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';