Avoid reporting crashes for exceptions that hit our SEH from calls to the ori...

chrome_frame/crash_reporting/crash_report.cc

 
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // crash_report.cc : Implementation crash reporting.
 #include "chrome_frame/crash_reporting/crash_report.h"
 
 #include "base/basictypes.h"
 #include "base/lock.h"
@@ skipping 29 matching lines @@
 #pragma code_seg(pop)
 
 #pragma code_seg(push, ".text$vz")
 static void veh_segment_end() {}
 #pragma code_seg(pop)
 
 // Place code in .text$veh_m.
 #pragma code_seg(push, ".text$vm")
 #include "chrome_frame/crash_reporting/vectored_handler-impl.h"
 
-// Use Win32 API; use breakpad for dumps; checks for single (current) module.
-class CrashHandlerTraits : public Win32VEHTraits,
-                           public ModuleOfInterestWithExcludedRegion {
- public:
-  CrashHandlerTraits() {}
-
-  // Note that breakpad_lock must be held when this is called.
-  void Init(google_breakpad::ExceptionHandler* breakpad, Lock* breakpad_lock) {
-    DCHECK(breakpad);
-    DCHECK(breakpad_lock);
-    breakpad_lock->AssertAcquired();
-
-    Win32VEHTraits::InitializeIgnoredBlocks();
-    ModuleOfInterestWithExcludedRegion::SetCurrentModule();
-    // Pointers to static (non-extern) functions take the address of the
-    // function's first byte, as opposed to an entry in the compiler generated
-    // JMP table. In release builds /OPT:REF wipes away the JMP table, but debug
-    // builds are not so lucky.
-    ModuleOfInterestWithExcludedRegion::SetExcludedRegion(&veh_segment_start,
-                                                          &veh_segment_end);
-  }
-
-  void Shutdown() {
-  }
-
-  inline bool WriteDump(EXCEPTION_POINTERS* p) {
-    return WriteMinidumpForException(p);
-  }
-};
-
 class CrashHandler {
  public:
   CrashHandler() : veh_id_(NULL), handler_(&crash_api_) {}
 
   // Note that breakpad_lock is used to protect accesses to breakpad and must
   // be held when Init() is called.
   bool Init(google_breakpad::ExceptionHandler* breakpad, Lock* breakpad_lock);
 
   void Shutdown();
  private:
@@ skipping 18 matching lines @@
 
 bool CrashHandler::Init(google_breakpad::ExceptionHandler* breakpad,
                         Lock* breakpad_lock) {
   DCHECK(breakpad);
   DCHECK(breakpad_lock);
   breakpad_lock->AssertAcquired();
 
   if (veh_id_)
     return true;
 
+  crash_api_.Init(&veh_segment_start, &veh_segment_end,
+                  &WriteMinidumpForException);
+
   void* id = ::AddVectoredExceptionHandler(FALSE, &VectoredHandlerEntryPoint);
   if (id != NULL) {
     veh_id_ = id;
-    crash_api_.Init(breakpad, breakpad_lock);
     return true;
+  } else {
+    crash_api_.Shutdown();
+    return false;
   }
-
-  return false;
 }
 
 void CrashHandler::Shutdown() {
   if (veh_id_) {
     ::RemoveVectoredExceptionHandler(veh_id_);
     veh_id_ = NULL;
   }
 
   crash_api_.Shutdown();
 }
@@ skipping 62 matching lines @@
 }
 
 bool WriteMinidumpForException(EXCEPTION_POINTERS* p) {
   AutoLock lock(g_breakpad_lock);
   bool success = false;
   if (g_breakpad) {
     success = g_breakpad->WriteMinidumpForException(p);
   }
   return success;
 }