From 5923cde28eecb829a6bd799f87d7c61f6f258cd3 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Tue, 11 Jan 2011 17:01:22 -0500
Subject: [PATCH] Bug 624835 - Exception handler ignores ::DebugBreak
 exceptions when it really shouldn't, r=ted a=blocker

--HG--
extra : rebase_source : 619ac4f326a67d114900691f6e61ca4a00a6f73d
---
 toolkit/crashreporter/nsExceptionHandler.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index 30b578be145..ecebfc93b02 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -766,6 +766,10 @@ nsresult SetExceptionHandler(nsILocalFile* aXREDirectory,
   if (!gExceptionHandler)
     return NS_ERROR_OUT_OF_MEMORY;
 
+#ifdef XP_WIN
+  gExceptionHandler->set_handle_debug_exceptions(true);
+#endif
+
   // store application start time
   char timeString[32];
   time_t startupTime = time(NULL);
@@ -1864,6 +1868,9 @@ SetRemoteExceptionHandler(const nsACString& crashPipe)
                      MiniDumpNormal,
                      NS_ConvertASCIItoUTF16(crashPipe).BeginReading(),
                      NULL);
+#ifdef XP_WIN
+  gExceptionHandler->set_handle_debug_exceptions(true);
+#endif
 
   // we either do remote or nothing, no fallback to regular crash reporting
   return gExceptionHandler->IsOutOfProcess();