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

Unified Diff: third_party/crashpad/crashpad/handler/handler_main.cc

Issue 2585883002: Update Crashpad to 0567536f86fb10f9663fb30d6ebf08a7c35b975d (Closed)
Patch Set: Created 4 years 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
Index: third_party/crashpad/crashpad/handler/handler_main.cc
diff --git a/third_party/crashpad/crashpad/handler/handler_main.cc b/third_party/crashpad/crashpad/handler/handler_main.cc
index 29c5ddc14e6c4a26b7842eebb813b00f7c5a2eec..3ada8c3e50567990378061214fe03252783f5edf 100644
--- a/third_party/crashpad/crashpad/handler/handler_main.cc
+++ b/third_party/crashpad/crashpad/handler/handler_main.cc
@@ -129,9 +129,15 @@ void HandleSIGTERM(int sig, siginfo_t* siginfo, void* context) {
#endif // OS_MACOSX
#if defined(OS_WIN)
+LONG(WINAPI* g_original_exception_filter)(EXCEPTION_POINTERS*) = nullptr;
+
LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
Metrics::HandlerCrashed(exception_pointers->ExceptionRecord->ExceptionCode);
- return EXCEPTION_CONTINUE_SEARCH;
+
+ if (g_original_exception_filter)
+ return g_original_exception_filter(exception_pointers);
+ else
+ return EXCEPTION_CONTINUE_SEARCH;
}
#endif // OS_WIN
@@ -139,7 +145,8 @@ LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
int HandlerMain(int argc, char* argv[]) {
#if defined(OS_WIN)
- SetUnhandledExceptionFilter(&UnhandledExceptionHandler);
+ g_original_exception_filter =
+ SetUnhandledExceptionFilter(&UnhandledExceptionHandler);
#endif
const base::FilePath argv0(
« no previous file with comments | « third_party/crashpad/README.chromium ('k') | third_party/crashpad/crashpad/handler/win/crashy_test_program.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698