From bce6638c052d46ae3e38f2d80ed33db4cea11d06 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 29 Jun 2011 15:29:27 -0400
Subject: [PATCH] Bug 581341 - Part 3: Install child process exception handler
 before activating breakpad. r=bsmedberg

--HG--
extra : rebase_source : 32fa9c79f1620226e59459609e9c4390a511e5ad
---
 toolkit/crashreporter/nsExceptionHandler.cpp | 2 +-
 toolkit/xre/nsEmbedFunctions.cpp             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index dd8f1f1d4b1a..5acfada4e37f 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -1886,7 +1886,7 @@ SetRemoteExceptionHandler(const nsACString& crashPipe)
 
   gExceptionHandler = new google_breakpad::
     ExceptionHandler(L"",
-                     NULL,    // no filter callback
+                     FPEFilter,
                      NULL,    // no minidump callback
                      NULL,    // no callback context
                      google_breakpad::ExceptionHandler::HANDLER_ALL,
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 357f6492f1ff..b4ecd972dac1 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -359,7 +359,9 @@ XRE_InitChildProcess(int aArgc,
     return 1;
   }
 #endif
-  
+
+  SetupErrorHandling(aArgv[0]);  
+
 #if defined(MOZ_CRASHREPORTER)
   if (aArgc < 1)
     return 1;
@@ -386,8 +388,6 @@ XRE_InitChildProcess(int aArgc,
   gArgv = aArgv;
   gArgc = aArgc;
 
-  SetupErrorHandling(aArgv[0]);
-  
 #if defined(MOZ_WIDGET_GTK2)
   g_thread_init(NULL);
 #endif