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

msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes.

This commit is contained in:
Alexander Scott-Johns 2010-06-07 02:54:14 +01:00 committed by Alexandre Julliard
parent 4e8e2f39c5
commit d56113cd4f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msvcrt/wcs.c
View File

@ -1147,17 +1147,17 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer
{ {
int len, ret; int len, ret;
len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); len = sizeOfBuffer;
if(count!=-1 && len>count+1) if(count!=-1 && len>count+1)
len = count+1; len = count+1;
ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist);
if(ret<0 || ret==len) { if(ret<0 || ret==len) {
if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) {
MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
*MSVCRT__errno() = MSVCRT_ERANGE; *MSVCRT__errno() = MSVCRT_ERANGE;
memset(str, 0, sizeOfBuffer); memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t));
} else } else
str[len-1] = '\0'; str[len-1] = '\0';
@ -1242,8 +1242,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
int r; int r;
__ms_va_start(ap, format); __ms_va_start(ap, format);
r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), r = MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, ap);
INT_MAX, format, ap);
__ms_va_end(ap); __ms_va_end(ap);
return r; return r;
@ -1271,8 +1270,7 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )
int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
const MSVCRT_wchar_t* format, __ms_va_list args) const MSVCRT_wchar_t* format, __ms_va_list args)
{ {
return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), return MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, args );
INT_MAX, format, args);
} }
/********************************************************************* /*********************************************************************
@ -1281,8 +1279,8 @@ int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements
int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args) const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args)
{ {
return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t), return MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX,
INT_MAX, format, locale, args ); format, locale, args );
} }
/********************************************************************* /*********************************************************************