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

chrome_frame/urlmon_moniker.cc

 // Copyright (c) 2010 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.
 
 #include "chrome_frame/urlmon_moniker.h"
 
 #include <shlguid.h>
 
 #include "base/string_util.h"
 #include "chrome_frame/bho.h"
@@ skipping 144 matching lines @@
   return should_wrap;
 }
 
 // static
 HRESULT MonikerPatch::BindToObject(IMoniker_BindToObject_Fn original,
                                    IMoniker* me, IBindCtx* bind_ctx,
                                    IMoniker* to_left, REFIID iid, void** obj) {
   DLOG(INFO) << __FUNCTION__;
   DCHECK(to_left == NULL);
 
-  ExceptionBarrier barrier;
+  ExceptionBarrierReportOnlyModule barrier;
 
   HRESULT hr = S_OK;
   // Bind context is marked for switch when we sniff data in BSCBStorageBind
   // and determine that the renderer to be used is Chrome.
   scoped_refptr<BindContextInfo> info =
       BindContextInfo::FromBindContext(bind_ctx);
   DCHECK(info);
   if (info) {
     if (info->is_switching()) {
       // We could implement the BindToObject ourselves here but instead we
@@ skipping 22 matching lines @@
   DCHECK(to_left == NULL);
 
   HRESULT hr = S_OK;
   CComObject<BSCBStorageBind>* callback = NULL;
   if (ShouldWrapCallback(me, iid, bind_ctx)) {
     hr = CComObject<BSCBStorageBind>::CreateInstance(&callback);
     callback->AddRef();
     hr = callback->Initialize(me, bind_ctx);
     DCHECK(SUCCEEDED(hr));
 
-    // Call the original back under an exception barrier only if we should
-    // wrap the callback.
+    // Report all crashes in the exception handler if we wrap the callback.
+    // Note that this avoids having the VEH report a crash if an SEH earlier in
+    // the chain handles the exception.
     ExceptionBarrier barrier;
     hr = original(me, bind_ctx, to_left, iid, obj);
   } else {
+    // If we don't wrap, only report a crash if the crash is in our own module.
+    ExceptionBarrierReportOnlyModule barrier;
     hr = original(me, bind_ctx, to_left, iid, obj);
   }
 
   // If the binding terminates before the data could be played back
   // now is the chance. Sometimes OnStopBinding happens after this returns
   // and then it's too late.
   if ((S_OK == hr) && callback)
     callback->MayPlayBack(BSCF_LASTDATANOTIFICATION);
   return hr;
 }