Fix for a plugin crasher which occurs in the context of NPP_Destroy. The plug...

webkit/plugins/npapi/plugin_host.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 "webkit/plugins/npapi/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
@@ skipping 274 matching lines @@
 
 extern "C" {
 
 using webkit::npapi::FindInstance;
 using webkit::npapi::PluginHost;
 using webkit::npapi::PluginInstance;
 using webkit::npapi::WebPlugin;
 
 // Allocates memory from the host's memory space.
 void* NPN_MemAlloc(uint32_t size) {
-  scoped_refptr<PluginHost> host(PluginHost::Singleton());
-  if (host != NULL) {
-    // Note: We must use the same allocator/deallocator
-    // that is used by the javascript library, as some of the
-    // JS APIs will pass memory to the plugin which the plugin
-    // will attempt to free.
-    return malloc(size);
-  }
-  return NULL;
+  // Note: We must use the same allocator/deallocator
+  // that is used by the javascript library, as some of the
+  // JS APIs will pass memory to the plugin which the plugin
+  // will attempt to free.
+  return malloc(size);
 }
 
 // Deallocates memory from the host's memory space
 void NPN_MemFree(void* ptr) {
-  scoped_refptr<PluginHost> host(PluginHost::Singleton());
-  if (host != NULL) {
-    if (ptr != NULL && ptr != reinterpret_cast<void*>(-1))
-      free(ptr);
-  }
+  if (ptr != NULL && ptr != reinterpret_cast<void*>(-1))
+    free(ptr);
 }
 
 // Requests that the host free a specified amount of memory.
 uint32_t NPN_MemFlush(uint32_t size) {
   // This is not relevant on Windows; MAC specific
   return size;
 }
 
 // This is for dynamic discovery of new plugins.
 // Should force a re-scan of the plugins directory to load new ones.
@@ skipping 790 matching lines @@
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
   scoped_refptr<PluginInstance> plugin(FindInstance(instance));
   if (plugin.get()) {
     plugin->URLRedirectResponse(!!allow, notify_data);
   }
 }
 
 }  // extern "C"