aboutsummaryrefslogtreecommitdiff
path: root/src/tools/windows/symupload
diff options
context:
space:
mode:
authormmentovai <mmentovai@4c0a9323-5329-0410-9bdc-e9ce6186880e>2007-03-30 20:30:08 +0000
committermmentovai <mmentovai@4c0a9323-5329-0410-9bdc-e9ce6186880e>2007-03-30 20:30:08 +0000
commitaec44489da7da17b5babd9343850257558741fa2 (patch)
tree25f5b508ab1f7c0922e909f3b1ca7440fc529f30 /src/tools/windows/symupload
parentFix issue 136. (diff)
downloadbreakpad-aec44489da7da17b5babd9343850257558741fa2.tar.xz
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
Diffstat (limited to 'src/tools/windows/symupload')
-rw-r--r--src/tools/windows/symupload/symupload.cc15
1 files changed, 8 insertions, 7 deletions
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<VS_FIXEDFILEINFO*>(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;
}