[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[adachan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4acc1e98fb1317d3a7883eebba3338afc6b4ce43
Author: adachan at apple.com <adachan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 00:09:54 2010 +0000

            Reviewed by Steve Falkenburg.
    
            <rdar://problem/8185379> Possible null dereference in WebView::canShowMIMEType.
            https://bugs.webkit.org/show_bug.cgi?id=44564
    
            * WebView.cpp:
            (WebView::canShowMIMEType): Null check m_page->pluginData() since that can return NULL
            if plugins are disabled.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index e149879..9a20e51 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-24  Ada Chan  <adachan at apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        <rdar://problem/8185379> Possible null dereference in WebView::canShowMIMEType.
+        https://bugs.webkit.org/show_bug.cgi?id=44564
+
+        * WebView.cpp:
+        (WebView::canShowMIMEType): Null check m_page->pluginData() since that can return NULL
+        if plugins are disabled.
+
 2010-08-22  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 4814967..c682e91 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -2432,7 +2432,7 @@ HRESULT STDMETHODCALLTYPE WebView::canShowMIMEType(
 
     *canShow = MIMETypeRegistry::isSupportedImageMIMEType(mimeTypeStr) ||
         MIMETypeRegistry::isSupportedNonImageMIMEType(mimeTypeStr) ||
-        (m_page && m_page->pluginData()->supportsMimeType(mimeTypeStr)) ||
+        (m_page && m_page->pluginData() && m_page->pluginData()->supportsMimeType(mimeTypeStr)) ||
         shouldUseEmbeddedView(mimeTypeStr);
     
     return S_OK;

-- 
WebKit Debian packaging