<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207563] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207563">207563</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-10-19 13:30:27 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
https://bugs.webkit.org/show_bug.cgi?id=163476
<rdar://problem/26941395>
Reviewed by Andreas Kling.
Source/WebKit2:
When custom content providers are registered and a response has a null MIME type, WebPage
will pass a null String to HashSet::contains(). This results in a null pointer dereference,
since the String hash functions do not support null Strings and unconditionally dereference
their StringImpls. Fixed by checking that Strings are non-null before calling
HashSet::contains() on m_mimeTypesWithCustomContentProviders.
New API test: WebKit2.LoadDataWithNilMIMEType.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::shouldUseCustomContentProviderForResponse): Checked if mimeType is null
before calling m_mimeTypesWithCustomContentProviders.contains().
(WebKit::WebPage::canShowMIMEType): Ditto.
* WebProcess/WebPage/WebPage.h: Made private the declaration of canPluginHandleResponse().
Tools:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm: Added.
(TEST): Added an API test that passes a nil MIMEType to
-[WKWebView loadData:MIMEType:characterEncodingName:baseURL:].</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaLoadDataWithNilMIMETypemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207562 => 207563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-19 20:29:02 UTC (rev 207562)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-19 20:30:27 UTC (rev 207563)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-19 Andy Estes <aestes@apple.com>
+
+ Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
+ https://bugs.webkit.org/show_bug.cgi?id=163476
+ <rdar://problem/26941395>
+
+ Reviewed by Andreas Kling.
+
+ When custom content providers are registered and a response has a null MIME type, WebPage
+ will pass a null String to HashSet::contains(). This results in a null pointer dereference,
+ since the String hash functions do not support null Strings and unconditionally dereference
+ their StringImpls. Fixed by checking that Strings are non-null before calling
+ HashSet::contains() on m_mimeTypesWithCustomContentProviders.
+
+ New API test: WebKit2.LoadDataWithNilMIMEType.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::shouldUseCustomContentProviderForResponse): Checked if mimeType is null
+ before calling m_mimeTypesWithCustomContentProviders.contains().
+ (WebKit::WebPage::canShowMIMEType): Ditto.
+ * WebProcess/WebPage/WebPage.h: Made private the declaration of canPluginHandleResponse().
+
</ins><span class="cx"> 2016-10-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move HTML Interactive Form Validation behind an experimental flag
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207562 => 207563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-19 20:29:02 UTC (rev 207562)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-19 20:30:27 UTC (rev 207563)
</span><span class="lines">@@ -4599,8 +4599,13 @@
</span><span class="cx">
</span><span class="cx"> bool WebPage::shouldUseCustomContentProviderForResponse(const ResourceResponse& response)
</span><span class="cx"> {
</span><ins>+ auto& mimeType = response.mimeType();
+ if (mimeType.isNull())
+ return false;
+
</ins><span class="cx"> // If a plug-in exists that claims to support this response, it should take precedence over the custom content provider.
</span><del>- return m_mimeTypesWithCustomContentProviders.contains(response.mimeType()) && !canPluginHandleResponse(response);
</del><ins>+ // canPluginHandleResponse() is called last because it performs synchronous IPC.
+ return m_mimeTypesWithCustomContentProviders.contains(mimeType) && !canPluginHandleResponse(response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -5025,7 +5030,7 @@
</span><span class="cx"> if (MIMETypeRegistry::canShowMIMEType(MIMEType))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (m_mimeTypesWithCustomContentProviders.contains(MIMEType))
</del><ins>+ if (!MIMEType.isNull() && m_mimeTypesWithCustomContentProviders.contains(MIMEType))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> const PluginData& pluginData = m_page->pluginData();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (207562 => 207563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-19 20:29:02 UTC (rev 207562)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-19 20:30:27 UTC (rev 207563)
</span><span class="lines">@@ -845,7 +845,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool shouldUseCustomContentProviderForResponse(const WebCore::ResourceResponse&);
</span><del>- bool canPluginHandleResponse(const WebCore::ResourceResponse& response);
</del><span class="cx">
</span><span class="cx"> bool asynchronousPluginInitializationEnabled() const { return m_asynchronousPluginInitializationEnabled; }
</span><span class="cx"> void setAsynchronousPluginInitializationEnabled(bool enabled) { m_asynchronousPluginInitializationEnabled = enabled; }
</span><span class="lines">@@ -1227,6 +1226,8 @@
</span><span class="cx"> void setResourceCachingDisabled(bool);
</span><span class="cx"> void setUserInterfaceLayoutDirection(uint32_t);
</span><span class="cx">
</span><ins>+ bool canPluginHandleResponse(const WebCore::ResourceResponse&);
+
</ins><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::Page> m_page;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (207562 => 207563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-19 20:29:02 UTC (rev 207562)
+++ trunk/Tools/ChangeLog 2016-10-19 20:30:27 UTC (rev 207563)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-19 Andy Estes <aestes@apple.com>
+
+ Crash in ASCIICaseInsensitiveHash::hash() when a response has a null MIME type
+ https://bugs.webkit.org/show_bug.cgi?id=163476
+ <rdar://problem/26941395>
+
+ Reviewed by Andreas Kling.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm: Added.
+ (TEST): Added an API test that passes a nil MIMEType to
+ -[WKWebView loadData:MIMEType:characterEncodingName:baseURL:].
+
</ins><span class="cx"> 2016-10-19 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Modify testrunner to mute audio during tests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (207562 => 207563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-19 20:29:02 UTC (rev 207562)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-19 20:30:27 UTC (rev 207563)
</span><span class="lines">@@ -425,6 +425,7 @@
</span><span class="cx"> 9B4F8FA7159D52DD002D9F94 /* HTMLCollectionNamedItem.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */; };
</span><span class="cx"> 9C64DC321D76198A004B598E /* YouTubePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */; };
</span><span class="cx"> A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */; };
</span><ins>+ A125478F1DB18B9400358564 /* LoadDataWithNilMIMEType.mm in Sources */ = {isa = PBXBuildFile; fileRef = A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */; };
</ins><span class="cx"> A13EBBAA1B87428D00097110 /* WebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBA91B87428D00097110 /* WebProcessPlugIn.mm */; };
</span><span class="cx"> A13EBBAB1B87434600097110 /* PlatformUtilitiesCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */; };
</span><span class="cx"> A13EBBB01B87436F00097110 /* BundleParametersPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBAE1B87436F00097110 /* BundleParametersPlugIn.mm */; };
</span><span class="lines">@@ -1054,6 +1055,7 @@
</span><span class="cx"> 9B79164F1BD89D0D00D50B8F /* FirstResponderScrollingPosition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FirstResponderScrollingPosition.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubePluginReplacement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFiltering.mm; sourceTree = "<group>"; };
</span><ins>+ A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoadDataWithNilMIMEType.mm; sourceTree = "<group>"; };
</ins><span class="cx"> A13EBB491B87339E00097110 /* TestWebKitAPI.wkbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestWebKitAPI.wkbundle; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> A13EBB521B87346600097110 /* WebProcessPlugIn.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcessPlugIn.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> A13EBB541B8734E000097110 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="lines">@@ -1427,6 +1429,7 @@
</span><span class="cx"> 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */,
</span><span class="cx"> 0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
</span><span class="cx"> 9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */,
</span><ins>+ A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */,
</ins><span class="cx"> );
</span><span class="cx"> name = "WebKit2 Cocoa";
</span><span class="cx"> path = WebKit2Cocoa;
</span><span class="lines">@@ -2395,6 +2398,7 @@
</span><span class="cx"> 37B47E301D64E7CA005F4EFF /* WKObject.mm in Sources */,
</span><span class="cx"> 7CCE7EC01A411A7E00447C4C /* FragmentNavigation.mm in Sources */,
</span><span class="cx"> 7CCE7EF61A411AE600447C4C /* FrameMIMETypeHTML.cpp in Sources */,
</span><ins>+ A125478F1DB18B9400358564 /* LoadDataWithNilMIMEType.mm in Sources */,
</ins><span class="cx"> 7CCE7EF71A411AE600447C4C /* FrameMIMETypePNG.cpp in Sources */,
</span><span class="cx"> 7C83E0BD1D0A650C00FEBCF3 /* FullscreenTopContentInset.mm in Sources */,
</span><span class="cx"> CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaLoadDataWithNilMIMETypemm"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm (0 => 207563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm 2016-10-19 20:30:27 UTC (rev 207563)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#if WK_API_ENABLED
+
+#import "TestNavigationDelegate.h"
+#import <WebKit/WebKit.h>
+#import <wtf/RetainPtr.h>
+
+TEST(WebKit2, LoadDataWithNilMIMEType)
+{
+ auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSZeroRect]);
+ NSString *mimeType = nil;
+ [webView loadData:[@"test" dataUsingEncoding:NSUTF8StringEncoding] MIMEType:mimeType characterEncodingName:@"UTF-8" baseURL:[NSURL URLWithString:@"about:blank"]];
+ [webView _test_waitForDidFinishNavigation];
+}
+
+#endif // WK_API_ENABLED
</ins></span></pre>
</div>
</div>
</body>
</html>