Add an ExceptionBarrier around outbound calls to patched methods in IE. In so...

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"
 #include "chrome_frame/bind_context_info.h"
+#include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/urlmon_bind_status_callback.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 #include "net/http/http_util.h"
 
 static const int kMonikerBindToObject = 8;
 static const int kMonikerBindToStorage = kMonikerBindToObject + 1;
 
 base::LazyInstance<base::ThreadLocalPointer<NavigationManager> >
@@ skipping 132 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;
+
   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
       // simply register Chrome Frame ActiveDoc as a handler for 'text/html'
@@ skipping 20 matching lines @@
                                     IMoniker* to_left, REFIID iid, void** obj) {
   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.
+    ExceptionBarrier barrier;
+    hr = original(me, bind_ctx, to_left, iid, obj);
+  } else {
+    hr = original(me, bind_ctx, to_left, iid, obj);
   }
 
-  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;
 }