| Index: chrome_elf/chrome_elf_main.cc
|
| diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc
|
| index a0bf20a3e53f494ce8f15b2dbcd2bc6fbefc2521..efdf1050698064d9f308db7b347b38c97253505f 100644
|
| --- a/chrome_elf/chrome_elf_main.cc
|
| +++ b/chrome_elf/chrome_elf_main.cc
|
| @@ -39,11 +39,11 @@ BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
|
| if (reason == DLL_PROCESS_ATTACH) {
|
| install_static::InitializeProductDetailsForPrimaryModule();
|
|
|
| -// CRT on initialization installs an exception filter which calls
|
| -// TerminateProcess. We need to hook CRT's attempt to set an exception.
|
| -// NOTE: Do not hook if ASan is present, or ASan will fail to install
|
| -// its own unhandled exception filter.
|
| #if !defined(ADDRESS_SANITIZER)
|
| + // CRT on initialization installs an exception filter which calls
|
| + // TerminateProcess. We need to hook CRT's attempt to set an exception.
|
| + // NOTE: Do not hook if ASan is present, or ASan will fail to install
|
| + // its own unhandled exception filter.
|
| elf_crash::DisableSetUnhandledExceptionFilter();
|
| #endif // !defined (ADDRESS_SANITIZER)
|
|
|
|
|