From aec44489da7da17b5babd9343850257558741fa2 Mon Sep 17 00:00:00 2001 From: mmentovai Date: Fri, 30 Mar 2007 20:30:08 +0000 Subject: vswprintf causes Purify to fail (#145). r=darin http://groups.google.com/group/google-breakpad-dev/browse_thread/thread/88e18d9fac4eee22 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@135 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/tools/windows/symupload/symupload.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/tools') diff --git a/src/tools/windows/symupload/symupload.cc b/src/tools/windows/symupload/symupload.cc index e6a51314..54abf73a 100644 --- a/src/tools/windows/symupload/symupload.cc +++ b/src/tools/windows/symupload/symupload.cc @@ -91,13 +91,14 @@ static bool GetFileVersionString(const wchar_t *filename, wstring *version) { wchar_t ver_string[24]; VS_FIXEDFILEINFO *file_info = reinterpret_cast(file_info_buffer); - WindowsStringUtils::safe_swprintf( - ver_string, sizeof(ver_string) / sizeof(ver_string[0]), - L"%d.%d.%d.%d", - file_info->dwFileVersionMS >> 16, - file_info->dwFileVersionMS & 0xffff, - file_info->dwFileVersionLS >> 16, - file_info->dwFileVersionLS & 0xffff); + swprintf(ver_string, sizeof(ver_string) / sizeof(ver_string[0]), + L"%d.%d.%d.%d", + file_info->dwFileVersionMS >> 16, + file_info->dwFileVersionMS & 0xffff, + file_info->dwFileVersionLS >> 16, + file_info->dwFileVersionLS & 0xffff); + GB_WSU_SAFE_SWPRINTF_TERMINATE(ver_string, + sizeof(ver_string) / sizeof(ver_string[0])); *version = ver_string; return true; } -- cgit v1.2.1