[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9c0aab718edb87c3d3d6eedeea822db7d1ead38e
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 10:35:43 2009 +0000

    Crash fix when loading NPAPI plugins on Qt/Mac
    
    Reviewed by Ariya Hidayat.
    
    There's no guarantee that the plist will be valid even if we
    ask the plugin to create it. Crash obverved with iGetter.
    
    * plugins/mac/PluginPackageMac.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b233e96..5e2815f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        Crash fix when loading NPAPI plugins on Qt/Mac
+
+        There's no guarantee that the plist will be valid even if we
+        ask the plugin to create it. Crash obverved with iGetter.
+
+        * plugins/mac/PluginPackageMac.cpp:
+
 2009-10-15  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/plugins/mac/PluginPackageMac.cpp b/WebCore/plugins/mac/PluginPackageMac.cpp
index d242fb8..325bc4d 100644
--- a/WebCore/plugins/mac/PluginPackageMac.cpp
+++ b/WebCore/plugins/mac/PluginPackageMac.cpp
@@ -159,7 +159,8 @@ bool PluginPackage::fetchInfo()
             plist = readPListFile(path.get(), /*createFile*/ true, m_module);
         }
 
-        mimeDict = (CFDictionaryRef)CFDictionaryGetValue(plist.get(), CFSTR("WebPluginMIMETypes"));
+        if (plist)
+            mimeDict = (CFDictionaryRef)CFDictionaryGetValue(plist.get(), CFSTR("WebPluginMIMETypes"));
     }
 
     if (!mimeDict)

-- 
WebKit Debian packaging