system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 03:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Improve error handling in wcsrtombs function.

Browse source
This commit is contained in:
Piotr Caban 2013-09-24 15:51:48 +02:00 committed by Alexandre Julliard
parent dbbe237985
commit b50833389e
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/msvcrt/wcs.c
View file

@ -407,8 +407,10 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst
if(!mbstr) {
tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
*wcstr, -1, NULL, 0, NULL, &used_default)-1;
if(used_default)
if(!tmp || used_default) {
*MSVCRT__errno() = MSVCRT_EILSEQ;
return -1;
}
return tmp;
}
@ -418,8 +420,10 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst
size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
*wcstr, 1, buf, 3, NULL, &used_default);
if(used_default)
if(!size || used_default) {
*MSVCRT__errno() = MSVCRT_EILSEQ;
return -1;
}
if(tmp+size > count)
return tmp;
@ -476,6 +480,8 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr,
if(!mbstr && !size && wcstr) {
conv = MSVCRT_wcsrtombs_l(NULL, wcstr, 0, locale);
if(conv == -1)
return *MSVCRT__errno();
if(ret)
*ret = conv+1;
return 0;
@ -492,7 +498,11 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr,
conv = count;
conv = MSVCRT_wcsrtombs_l(mbstr, wcstr, conv, locale);
if(conv<size)
if(conv == -1) {
if(size)
mbstr[0] = '\0';
return *MSVCRT__errno();
}else if(conv < size)
mbstr[conv++] = '\0';
else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0'))
mbstr[conv-1] = '\0';