Fix Bug 18615: Crash in PluginPackage::hash

        <https://bugs.webkit.org/show_bug.cgi?id=18615>

        Reviewed by Anders Carlsson.

        * plugins/PluginDatabase.cpp:
        (WebCore::PluginDatabase::refresh): Don't pass a null PluginPackage*
        to add().


Canonical link: https://commits.webkit.org/25669@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@32340 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

@@ -1,3 +1,15 @@
+2008-04-21  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 18615: Crash in PluginPackage::hash
+
+        <https://bugs.webkit.org/show_bug.cgi?id=18615>
+
+        Reviewed by Anders Carlsson.
+
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::refresh): Don't pass a null PluginPackage*
+        to add().
+
 2008-04-21  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam.

WebCore/plugins/PluginDatabase.cpp

@@ -106,7 +106,8 @@ bool PluginDatabase::refresh()
             remove(oldPackage.get());
         }
 
-        if (add(PluginPackage::createPackage(*it, lastModified)))
+        RefPtr<PluginPackage> package = PluginPackage::createPackage(*it, lastModified);
+        if (package && add(package.release()))
             pluginSetChanged = true;
     }
 
@@ -246,6 +247,8 @@ void PluginDatabase::getDeletedPlugins(PluginSet& plugins) const
 
 bool PluginDatabase::add(PassRefPtr<PluginPackage> prpPackage)
 {
+    ASSERT_ARG(prpPackage, prpPackage);
+
     RefPtr<PluginPackage> package = prpPackage;
 
     if (!m_plugins.add(package).second)