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

Unified Diff: chrome_elf/chrome_elf_main.cc

Issue 154653002: Breakpad coverage for chrome_elf start up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More breakpad, less base Created 6 years, 10 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
« chrome_elf/breakpad.cc ('K') | « chrome_elf/chrome_elf.gyp ('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 772c906f1d4e66d07739f797afb7fc867390ba4d..ee2c77004a0cbcf29984247307a5629017be2368 100644
--- a/chrome_elf/chrome_elf_main.cc
+++ b/chrome_elf/chrome_elf_main.cc
@@ -7,6 +7,7 @@
#include "chrome_elf/chrome_elf_main.h"
#include "chrome_elf/blacklist/blacklist.h"
+#include "chrome_elf/breakpad.h"
#include "chrome_elf/ntdll_cache.h"
void SignalChromeElf() {
@@ -15,11 +16,21 @@ void SignalChromeElf() {
BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
if (reason == DLL_PROCESS_ATTACH) {
- InitCache();
- blacklist::Initialize(false); // Don't force, abort if beacon is present.
+ InitializeCrashReporting();
+
+ __try {
+ *((unsigned int*)0) = 0xDEAD;
robertshield 2014/02/07 20:03:08 Don't think we want to leave this here?
Cait (Slow) 2014/02/10 18:13:20 On 2014/02/07 20:03:08, robertshield wrote: >I sup
+ InitCache();
+ blacklist::Initialize(false); // Don't force, abort if beacon is present.
+ } __except(GenerateCrashDump(GetExceptionInformation())) {
+ }
// TODO(csharp): Move additions to the DLL blacklist to a sane place.
// blacklist::AddDllToBlacklist(L"foo.dll");
+
+ // TODO(caitkp): We should really de-initialize our breakpad client here, to
+ // ensure that we don't block Chrome's when it tries to connect in win_main.
robertshield 2014/02/07 20:03:08 Did you mention that this might be ok as is?
Cait (Slow) 2014/02/10 18:13:20 Done.
+
}
return TRUE;
« chrome_elf/breakpad.cc ('K') | « chrome_elf/chrome_elf.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698