diff options
| author | mmentovai <mmentovai@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2007-03-30 20:30:08 +0000 |
|---|---|---|
| committer | mmentovai <mmentovai@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2007-03-30 20:30:08 +0000 |
| commit | aec44489da7da17b5babd9343850257558741fa2 (patch) | |
| tree | 25f5b508ab1f7c0922e909f3b1ca7440fc529f30 /src/common/windows/guid_string.cc | |
| parent | Fix issue 136. (diff) | |
| download | breakpad-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/common/windows/guid_string.cc')
| -rw-r--r-- | src/common/windows/guid_string.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/windows/guid_string.cc b/src/common/windows/guid_string.cc index e77432a3..dcc22aa0 100644 --- a/src/common/windows/guid_string.cc +++ b/src/common/windows/guid_string.cc @@ -42,26 +42,30 @@ namespace google_breakpad { // static wstring GUIDString::GUIDToWString(GUID *guid) { wchar_t guid_string[37]; - WindowsStringUtils::safe_swprintf( + swprintf( guid_string, sizeof(guid_string) / sizeof(guid_string[0]), L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + GB_WSU_SAFE_SWPRINTF_TERMINATE(guid_string, + sizeof(guid_string) / sizeof(guid_string[0])); return wstring(guid_string); } // static wstring GUIDString::GUIDToSymbolServerWString(GUID *guid) { wchar_t guid_string[33]; - WindowsStringUtils::safe_swprintf( + swprintf( guid_string, sizeof(guid_string) / sizeof(guid_string[0]), L"%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + GB_WSU_SAFE_SWPRINTF_TERMINATE(guid_string, + sizeof(guid_string) / sizeof(guid_string[0])); return wstring(guid_string); } |