Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3888)

Unified Diff: chrome/app/chrome_exe_main_win.cc

Issue 2591043002: SyzyASAN: Block for crash handler startup as temporary workaround for startup hang (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698