Changeset 234011 in webkit

Timestamp:

Jul 19, 2018 4:17:41 PM (6 years ago)

Author:

dino@apple.com

Message:

CrashTracer: com.apple.WebKit.WebContent.Development at com.apple.WebCore: std::optional<WTF::Vector<WebCore::PluginInfo, 0ul, WTF::CrashOnOverflow, 16ul> >::operator* & + 73
​https://bugs.webkit.org/show_bug.cgi?id=187820
<rdar://problem/42017759>

Reviewed by Antoine Quint.

Speculative fix for this crash, which is accessing an optional without checking
if it exists. The crash logs didn't point to a reproducible test case.

• plugins/PluginData.cpp:

(WebCore::PluginData::supportsWebVisibleMimeTypeForURL const): Return false if
the optional doesn't exist.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginData.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-19  Dean Jackson  <dino@apple.com>
+
+        CrashTracer: com.apple.WebKit.WebContent.Development at com.apple.WebCore: std::optional<WTF::Vector<WebCore::PluginInfo, 0ul, WTF::CrashOnOverflow, 16ul> >::operator* & + 73
+        https://bugs.webkit.org/show_bug.cgi?id=187820
+        <rdar://problem/42017759>
+
+        Reviewed by Antoine Quint.
+
+        Speculative fix for this crash, which is accessing an optional without checking
+        if it exists. The crash logs didn't point to a reproducible test case.
+
+        * plugins/PluginData.cpp:
+        (WebCore::PluginData::supportsWebVisibleMimeTypeForURL const): Return false if
+        the optional doesn't exist.
+
 2018-07-19  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/plugins/PluginData.cpp

@@ -125 +125 @@
     if (!protocolHostAndPortAreEqual(m_cachedVisiblePlugins.pageURL, url))
         m_cachedVisiblePlugins = { url, m_page.pluginInfoProvider().webVisiblePluginInfo(m_page, url) };
+    if (!m_cachedVisiblePlugins.pluginList)
+        return false;
     return supportsWebVisibleMimeType(mimeType, allowedPluginTypes, *m_cachedVisiblePlugins.pluginList);
 }