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

Allow IO while constructing an absolute path (prevents DCHECK failure) (#11697)

Browse source
This commit is contained in:
Aleš Pergl 2018-01-23 16:25:01 +01:00 • committed by shelley vohr
parent c49cb29ddf
commit 39554566cc
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/atom_browser_client.cc
View file

@ -239,9 +239,13 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line, base::CommandLine* command_line,
int process_id) { int process_id) {
// Make sure we're about to launch a known executable // Make sure we're about to launch a known executable
{
base::FilePath child_path; base::FilePath child_path;
PathService::Get(content::CHILD_PROCESS_EXE, &child_path); PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
base::ThreadRestrictions::ScopedAllowIO allow_io;
CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path); CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
}
std::string process_type = std::string process_type =
command_line->GetSwitchValueASCII(::switches::kProcessType); command_line->GetSwitchValueASCII(::switches::kProcessType);