mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Truncate the strings passed to google_breakpad::CustomInfoEntry

Browse source
This commit is contained in:
Cheng Zhao 2016-05-25 14:40:14 +09:00
parent 545c9f5bed
commit 34c4e797bb
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
atom/common/crash_reporter/crash_reporter_win.cc
View file

@ -43,6 +43,10 @@ const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent"; const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service"; const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
// Matches breakpad/src/client/windows/common/ipc_protocol.h.
const int kNameMaxLength = 64;
const int kValueMaxLength = 64;
typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle, typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
NTSTATUS ExitStatus); NTSTATUS ExitStatus);
char* g_real_terminate_process_stub = NULL; char* g_real_terminate_process_stub = NULL;
@ -247,9 +251,18 @@ google_breakpad::CustomClientInfo* CrashReporterWin::GetCustomInfo(
for (StringMap::const_iterator iter = upload_parameters_.begin(); for (StringMap::const_iterator iter = upload_parameters_.begin();
iter != upload_parameters_.end(); ++iter) { iter != upload_parameters_.end(); ++iter) {
custom_info_entries_.push_back(google_breakpad::CustomInfoEntry( // breakpad has hardcoded the length of name/value, and doesn't truncate
base::UTF8ToWide(iter->first).c_str(), // the values itself, so we have to truncate them here otherwise weird
base::UTF8ToWide(iter->second).c_str())); // things may happen.
std::wstring name = base::UTF8ToWide(iter->first);
std::wstring value = base::UTF8ToWide(iter->second);
if (name.length() > kNameMaxLength - 1)
name.resize(kNameMaxLength - 1);
if (value.length() > kValueMaxLength - 1)
value.resize(kValueMaxLength - 1);
custom_info_entries_.push_back(
google_breakpad::CustomInfoEntry(name.c_str(), value.c_str()));
} }
custom_info_.entries = &custom_info_entries_.front(); custom_info_.entries = &custom_info_entries_.front();