From d56113cd4fba1822984dc5204cb22875ba2eb2e8 Mon Sep 17 00:00:00 2001 From: Alexander Scott-Johns Date: Mon, 7 Jun 2010 02:54:14 +0100 Subject: [PATCH] msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes. --- dlls/msvcrt/wcs.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 90bc3b88543..78e42b2566f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1147,17 +1147,17 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer { int len, ret; - len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); + len = sizeOfBuffer; if(count!=-1 && len>count+1) len = count+1; ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); 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__errno() = MSVCRT_ERANGE; - memset(str, 0, sizeOfBuffer); + memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); } else str[len-1] = '\0'; @@ -1242,8 +1242,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, int r; __ms_va_start(ap, format); - r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, ap); + r = MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, ap); __ms_va_end(ap); 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, const MSVCRT_wchar_t* format, __ms_va_list args) { - return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, args); + return MSVCRT_vsnwprintf_s(str, numberOfElements, 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, const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, locale, args ); + return MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, + format, locale, args ); } /*********************************************************************