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

fix: gather crash data for unexpected helper path (#27804)

Browse source
This commit is contained in:
Jeremy Rose 2021-02-19 15:08:49 -08:00 committed by GitHub
parent 84aba24a2a
commit 1e4f67c197
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/electron_browser_client.cc
View file

@ -13,6 +13,7 @@
#include "base/base_switches.h" #include "base/base_switches.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/debug/crash_logging.h"
#include "base/environment.h" #include "base/environment.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/json/json_reader.h" #include "base/json/json_reader.h"
@ -718,7 +719,13 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
<< "Aborted from launching unexpected helper executable"; << "Aborted from launching unexpected helper executable";
} }
#else #else
base::PathService::Get(content::CHILD_PROCESS_EXE, &child_path); if (!base::PathService::Get(content::CHILD_PROCESS_EXE, &child_path)) {
CHECK(false) << "Unable to get child process binary name.";
}
SCOPED_CRASH_KEY_STRING256("ChildProcess", "child_process_exe",
child_path.AsUTF8Unsafe());
SCOPED_CRASH_KEY_STRING256("ChildProcess", "program",
program.AsUTF8Unsafe());
CHECK_EQ(program, child_path); CHECK_EQ(program, child_path);
#endif #endif
} }