Index: components/nacl/loader/nacl_main_platform_delegate_win.cc |
diff --git a/components/nacl/loader/nacl_main_platform_delegate_win.cc b/components/nacl/loader/nacl_main_platform_delegate_win.cc |
index f530961700f1b27e921f3ee038dd5905ece51182..cc75ad282f1b0f145dbea9d44d65970c5ced7c3c 100644 |
--- a/components/nacl/loader/nacl_main_platform_delegate_win.cc |
+++ b/components/nacl/loader/nacl_main_platform_delegate_win.cc |
@@ -26,6 +26,13 @@ void NaClMainPlatformDelegate::EnableSandbox() { |
// Warm up language subsystems before the sandbox is turned on. |
::GetUserDefaultLangID(); |
::GetUserDefaultLCID(); |
+ |
+#if defined(ADDRESS_SANITIZER) |
+ // Bind and leak dbghelp.dll before the token is lowered, otherwise |
+ // AddressSanitizer will crash when trying to symbolize a report. |
+ CHECK(LoadLibraryA("dbghelp.dll")); |
+#endif |
+ |
// Turn the sandbox on. |
target_services->LowerToken(); |
} |