Pepper: Tighten GetLiveModule in PluginRegistry.

content/renderer/pepper/pepper_plugin_registry.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_plugin_registry.h"
 
 #include "base/logging.h"
 #include "content/common/pepper_plugin_list.h"
+#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 namespace content {
 
 // static
 PepperPluginRegistry* PepperPluginRegistry::GetInstance() {
   static PepperPluginRegistry* registry = NULL;
   // This object leaks.  It is a temporary hack to work around a crash.
   // http://code.google.com/p/chromium/issues/detail?id=63234
@@ skipping 18 matching lines @@
   PepperPluginInfo plugin;
   if (!MakePepperPluginInfo(info, &plugin))
     return NULL;
 
   plugin_list_.push_back(plugin);
   return &plugin_list_[plugin_list_.size() - 1];
 }
 
 PluginModule* PepperPluginRegistry::GetLiveModule(const base::FilePath& path) {
   NonOwningModuleMap::iterator it = live_modules_.find(path);
   if (it == live_modules_.end())

[dmichael (off chromium), 2013/11/11 23:41:36]

I think "it" and "jt" are too similar.
Maybe:
it->module_iter
jt->instance_iter
?

     return NULL;
-  return it->second;
+
+  // Check the instances for the module to see if they've all been Delete()d.
+  // We don't want to return a PluginModule in that case, since the plugin may
+  // have exited already.
+  const PluginModule::PluginInstanceSet& instance_set =
+      it->second->GetAllInstances();
+  // If instance_set is empty, InstanceCreated() hasn't been called yet, so
+  // it's safe to return the PluginModule.
+  if (instance_set.size() == 0)
+    return it->second;
+
+  PluginModule::PluginInstanceSet::const_iterator jt = instance_set.begin();
+  while (jt != instance_set.end()) {
+    if (!(*jt)->is_deleted())
+      return it->second;
+    ++jt;
+  }
+  return NULL;
 }
 
 void PepperPluginRegistry::AddLiveModule(const base::FilePath& path,
                                          PluginModule* module) {
   DCHECK(live_modules_.find(path) == live_modules_.end());
   live_modules_[path] = module;
 }
 
 void PepperPluginRegistry::PluginModuleDead(PluginModule* dead_module) {
   // DANGER: Don't dereference the dead_module pointer! It may be in the
@@ skipping 49 matching lines @@
       if (!module->InitAsLibrary(current.path)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
         continue;
       }
     }
     preloaded_modules_[current.path] = module;
   }
 }
 
 }  // namespace content