Chromium Code Reviews| Index: chrome/app/chrome_exe_main_win.cc |
| diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc |
| index c30545379b81783bc954d3472421b7c7dbfe76bb..3268f165fa379bd184f1cb81983a9dc37ca2b73e 100644 |
| --- a/chrome/app/chrome_exe_main_win.cc |
| +++ b/chrome/app/chrome_exe_main_win.cc |
| @@ -207,6 +207,15 @@ int main() { |
| install_static::InstallDetails::InitializeFromPrimaryModule( |
| chrome::kChromeElfDllName); |
| +#if defined(SYZYASAN) |
| + // This is a temporary workaround for a race during startup with the |
| + // syzyasan_rtl.dll. See https://crbug.com/675710. |
| + HMODULE chrome_elf = GetModuleHandle(chrome::kChromeElfDllName); |
|
Sigurður Ásgeirsson
2016/12/20 20:42:47
Stoopid question: why don't we simply link against
scottmg
2016/12/20 20:51:45
Yuck, I have no idea. We probably do here actually
|
| + auto block_until_handler_started = reinterpret_cast<void (*)()>( |
| + GetProcAddress(chrome_elf, "BlockUntilHandlerStartedImpl")); |
| + block_until_handler_started(); |
| +#endif // SYZYASAN |
| + |
| // Initialize the CommandLine singleton from the environment. |
| base::CommandLine::Init(0, nullptr); |
| const base::CommandLine* command_line = |