A different approach to avoid crashes in buggy 3rd party BHOs.

chrome_frame/vtable_patch_manager.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.
 
 #include "chrome_frame/vtable_patch_manager.h"
 
+#include <atlcomcli.h>
+
 #include <algorithm>
-#include <atlcomcli.h>
 
 #include "base/atomicops.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 
 #include "chrome_frame/function_stub.h"
 
 namespace vtable_patch {
 
@@ skipping 64 matching lines @@
       DLOG(WARNING) << "Attempting to patch two different VTables with the "
           "same VTable information, or patching the same interface on "
           "multiple threads";
       continue;
     }
 
     PROC original_fn = vtable[it->index_];
     FunctionStub* stub = NULL;
 
 #ifndef NDEBUG
-    FunctionStub::FromCode(original_fn);
+    stub = FunctionStub::FromCode(original_fn);
     if (stub != NULL) {
       DLOG(ERROR) << "attempt to patch a function that's already patched";
       DCHECK(stub->destination_function() ==
              reinterpret_cast<uintptr_t>(it->method_)) <<
              "patching the same method multiple times with different hooks?";
       continue;
     }
 #endif
 
     stub = FunctionStub::Create(reinterpret_cast<uintptr_t>(original_fn),
@@ skipping 129 matching lines @@
   }
   patch_list_.clear();
   patch_list_lock_.Release();
 
   return true;
 }
 
 #endif  // disabled DynamicPatchManager
 
 }  // namespace vtable_patch