Changeset 65952 in webkit

Timestamp:

Aug 24, 2010 5:09:54 PM (14 years ago)

Author:

adachan@apple.com

Message:

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.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-08-24  Ada Chan  <adachan@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@rim.com>
 

trunk/WebKit/win/WebView.cpp

@@ -2433 +2433 @@
     *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);