Index: content/ppapi_plugin/ppapi_thread.cc |
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc |
index 6b2dc122a0ede2a332736be5f645593cfd8f701b..d2202446eaaec87931fd669d47dde419f5178d51 100644 |
--- a/content/ppapi_plugin/ppapi_thread.cc |
+++ b/content/ppapi_plugin/ppapi_thread.cc |
@@ -404,6 +404,12 @@ |
WarmupWindowsLocales(permissions); |
+#if defined(ADDRESS_SANITIZER) |
+ // Bind and leak dbghelp.dll before the token is lowered, otherwise |
+ // AddressSanitizer will crash when trying to symbolize a report. |
+ LoadLibraryA("dbghelp.dll"); |
+#endif |
+ |
g_target_services->LowerToken(); |
} |
#endif |