Fixing a crash when plugin messages are sent to dialogs.

Review URL: http://codereview.chromium.org/18130

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

3 files changed, 9 insertions, 0 deletions

diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc
index a0e41da..0f4b4e6 100644
--- a/chrome/common/chrome_plugin_lib.cc
+++ b/chrome/common/chrome_plugin_lib.cc
@@ -43,6 +43,11 @@ static bool IsSingleProcessMode() {
 }
 
 // static
+bool ChromePluginLib::IsInitialized() {
+  return (g_loaded_libs != NULL);
+}
+
+// static
 ChromePluginLib* ChromePluginLib::Create(const FilePath& filename,
                                          const CPBrowserFuncs* bfuncs) {
   // Keep a map of loaded plugins to ensure we only load each library once.
diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h
index 1609bad..21bf925 100644
--- a/chrome/common/chrome_plugin_lib.h
+++ b/chrome/common/chrome_plugin_lib.h
@@ -21,6 +21,7 @@ class MessageLoop;
 // issues a NOTIFY_CHROME_PLUGIN_UNLOADED notification.
 class ChromePluginLib : public base::RefCounted<ChromePluginLib>  {
  public:
+  static bool IsInitialized();
   static ChromePluginLib* Create(const FilePath& filename,
                                  const CPBrowserFuncs* bfuncs);
   static ChromePluginLib* Find(const FilePath& filename);
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index e0108e4..08ccd27 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -177,6 +177,9 @@ void RenderThread::OnMessageReceived(const IPC::Message& msg) {
 
 void RenderThread::OnPluginMessage(const FilePath& plugin_path,
                                    const std::vector<uint8>& data) {
+  if (!ChromePluginLib::IsInitialized()) {
+    return;
+  }
   CHECK(ChromePluginLib::IsPluginThread());
   ChromePluginLib *chrome_plugin = ChromePluginLib::Find(plugin_path);
   if (chrome_plugin) {