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

Unified Diff: chrome_elf/chrome_elf_main.cc

Issue 2225453002: Revert of Don't IAT patch SetUnhandledExceptionFilter when ASan is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months 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_elf/chrome_elf_main.cc
diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc
index 718bd8da8457b3cfb8f7ffa1ec7973aad0245bae..46e6e15b794bb8e1cf76ef0eac76907df32e9ad2 100644
--- a/chrome_elf/chrome_elf_main.cc
+++ b/chrome_elf/chrome_elf_main.cc
@@ -50,7 +50,6 @@
ChromeCrashReporterClient::InitializeCrashReportingForProcess();
}
-#if !defined(ADDRESS_SANITIZER)
// chrome_elf loads early in the process and initializes Crashpad. That in turn
// uses the SetUnhandledExceptionFilter API to set a top level exception
// handler for the process. When the process eventually initializes, CRT sets
@@ -81,7 +80,6 @@
SetUnhandledExceptionFilterPatch);
CHECK(patched == 0);
}
-#endif // !defined(ADDRESS_SANITIZER)
} // namespace
@@ -114,11 +112,8 @@
InitializeCrashReportingForProcess();
// CRT on initialization installs an exception filter which calls
// TerminateProcess. We need to hook CRT's attempt to set an exception
- // handler and ignore it. Don't do this when ASan is present, or ASan will
- // fail to install its own unhandled exception filter.
-#if !defined(ADDRESS_SANITIZER)
+ // handler and ignore it.
DisableSetUnhandledExceptionFilter();
-#endif
install_static::InitializeProcessType();
if (install_static::g_process_type ==
« 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