ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Handle null mbstr parameter in mbstowcs.

This commit is contained in:
Piotr Caban 2014-01-08 12:13:22 +01:00 committed by Alexandre Julliard
parent ec8e5c610b
commit 544d179434
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msvcrt/mbcs.c
View File

@ -2127,6 +2127,11 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr,
MSVCRT_pthreadlocinfo locinfo; MSVCRT_pthreadlocinfo locinfo;
MSVCRT_size_t i, size; MSVCRT_size_t i, size;
if(!mbstr) {
*MSVCRT__errno() = MSVCRT_EINVAL;
return -1;
}
if(!locale) if(!locale)
locinfo = get_locinfo(); locinfo = get_locinfo();
else else

5
dlls/msvcrt/tests/string.c
View File

@ -1635,6 +1635,11 @@ static void test_mbstowcs(void)
wOut[4] = '!'; wOut[5] = '\0'; wOut[4] = '!'; wOut[5] = '\0';
mOut[4] = '!'; mOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0';
errno = 0xdeadbeef;
ret = mbstowcs(wOut, NULL, 4);
ok(ret == -1, "mbstowcs did not return -1\n");
ok(errno == EINVAL, "errno = %d\n", errno);
ret = mbstowcs(NULL, mSimple, 0); ret = mbstowcs(NULL, mSimple, 0);
ok(ret == 4, "mbstowcs did not return 4\n"); ok(ret == 4, "mbstowcs did not return 4\n");