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

Unified Diff: chrome_elf/chrome_elf_main.cc

Issue 2428703002: Signal chrome_elf to initialize crash reporting, rather than doing it in DllMain (Closed)
Patch Set: . Created 4 years, 2 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 | « chrome_elf/chrome_elf_main.h ('k') | 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 fa60e2de4b472615b7aa81def3da820d234c0d95..95e0a415c41cb988fb256fe91ce2a12e9567d437 100644
--- a/chrome_elf/chrome_elf_main.cc
+++ b/chrome_elf/chrome_elf_main.cc
@@ -11,17 +11,23 @@
#include "chrome_elf/blacklist/blacklist.h"
#include "chrome_elf/crash/crash_helper.h"
+// This function is a temporary workaround for https://crbug.com/655788. We
+// need to come up with a better way to initialize crash reporting that can
+// happen inside DllMain().
+void SignalInitializeCrashReporting() {
+ if (!elf_crash::InitializeCrashReporting()) {
+#ifdef _DEBUG
+ assert(false);
+#endif // _DEBUG
+ }
+}
+
void SignalChromeElf() {
blacklist::ResetBeacon();
}
BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
if (reason == DLL_PROCESS_ATTACH) {
- if (!elf_crash::InitializeCrashReporting()) {
-#ifdef _DEBUG
- assert(false);
-#endif // _DEBUG
- }
// 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
« no previous file with comments | « chrome_elf/chrome_elf_main.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698