Check for a crashed plugin before creating resources to send to the plugin

BUG=95710
Review URL: http://codereview.chromium.org/7839040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101119 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 8 deletions

diff --git a/ppapi/shared_impl/resource_tracker.cc b/ppapi/shared_impl/resource_tracker.cc
index 6762aea..303e980 100644
--- a/ppapi/shared_impl/resource_tracker.cc
+++ b/ppapi/shared_impl/resource_tracker.cc
@@ -140,15 +140,14 @@ PP_Resource ResourceTracker::AddResource(Resource* object) {
   if (last_resource_value_ == kMaxPPId)
     return 0;
 
-  // If you hit this somebody forgot to call DidCreateInstance or the resource
-  // was created with an invalid PP_Instance.
-  //
-  // This is specifically a check even in release mode. When creating resources
-  // it can be easy to forget to validate the instance parameter. If somebody
-  // does forget, we don't want to introduce a vulnerability with invalid
-  // pointers floating around, so we die ASAP.
   InstanceMap::iterator found = instance_map_.find(object->pp_instance());
-  CHECK(found != instance_map_.end());
+  if (found == instance_map_.end()) {
+    // If you hit this, it's likely somebody forgot to call DidCreateInstance,
+    // the resource was created with an invalid PP_Instance, or the renderer
+    // side tried to create a resource for a plugin that crashed.
+    NOTREACHED();
+    return 0;
+  }
 
   PP_Resource new_id = MakeTypedId(++last_resource_value_, PP_ID_TYPE_RESOURCE);
   found->second->resources.insert(new_id);