- Revision
- 207443
- Author
- aes...@apple.com
- Date
- 2016-10-17 17:28:34 -0700 (Mon, 17 Oct 2016)
Log Message
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 Tim Horton.
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.
Rearranging WebPage::shouldUseCustomContentProviderForResponse() to call
canPluginHandleResponse() before checking m_mimeTypesWithCustomContentProviders uncovered a
crash in existing layout tests where WebPage::m_mainFrame can be NULL during WebPage
construction (m_mainFrame isn't yet initialized). Fixed this by passing the main Frame to
canPluginHandleResponseInFrame() instead of relying on m_mainFrame.
New API test: WebKit2.LoadDataWithNilMIMEType.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::transitionToCommittedFromCachedFrame): Passed
m_frame->coreFrame() to shouldUseCustomContentProviderForResponse().
(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage): Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::canPluginHandleResponse): Added a mainFrame parameter and used it instead
of m_mainFrame->coreFrame().
(WebKit::WebPage::shouldUseCustomContentProviderForResponse): Passed mainFrame to
canPluginHandleResponse(), and checked if mimeType is null before calling
m_mimeTypesWithCustomContentProviders.contains().
(WebKit::WebPage::canShowMIMEType): Checked if MIMEType is null before calling
m_mimeTypesWithCustomContentProviders.contains().
* WebProcess/WebPage/WebPage.h: Made canPluginHandleResponse() a private declaration.
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:].
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207442 => 207443)
--- trunk/Source/WebKit2/ChangeLog 2016-10-18 00:12:00 UTC (rev 207442)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-18 00:28:34 UTC (rev 207443)
@@ -1,3 +1,39 @@
+2016-10-17 Andy Estes <aes...@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 Tim Horton.
+
+ 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.
+
+ Rearranging WebPage::shouldUseCustomContentProviderForResponse() to call
+ canPluginHandleResponse() before checking m_mimeTypesWithCustomContentProviders uncovered a
+ crash in existing layout tests where WebPage::m_mainFrame can be NULL during WebPage
+ construction (m_mainFrame isn't yet initialized). Fixed this by passing the main Frame to
+ canPluginHandleResponseInFrame() instead of relying on m_mainFrame.
+
+ New API test: WebKit2.LoadDataWithNilMIMEType.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::transitionToCommittedFromCachedFrame): Passed
+ m_frame->coreFrame() to shouldUseCustomContentProviderForResponse().
+ (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage): Ditto.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::canPluginHandleResponse): Added a mainFrame parameter and used it instead
+ of m_mainFrame->coreFrame().
+ (WebKit::WebPage::shouldUseCustomContentProviderForResponse): Passed mainFrame to
+ canPluginHandleResponse(), and checked if mimeType is null before calling
+ m_mimeTypesWithCustomContentProviders.contains().
+ (WebKit::WebPage::canShowMIMEType): Checked if MIMEType is null before calling
+ m_mimeTypesWithCustomContentProviders.contains().
+ * WebProcess/WebPage/WebPage.h: Made canPluginHandleResponse() a private declaration.
+
2016-10-17 Chris Dumez <cdu...@apple.com>
[WK2][NetworkCache] PendingFrameLoad objects are sometimes leaked
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (207442 => 207443)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-18 00:12:00 UTC (rev 207442)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-18 00:28:34 UTC (rev 207443)
@@ -1294,8 +1294,9 @@
void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame*)
{
- const ResourceResponse& response = m_frame->coreFrame()->loader().documentLoader()->response();
- m_frameHasCustomContentProvider = m_frame->isMainFrame() && m_frame->page()->shouldUseCustomContentProviderForResponse(response);
+ auto& coreFrame = *m_frame->coreFrame();
+ const ResourceResponse& response = coreFrame.loader().documentLoader()->response();
+ m_frameHasCustomContentProvider = m_frame->isMainFrame() && m_frame->page()->shouldUseCustomContentProviderForResponse(response, coreFrame);
m_frameCameFromPageCache = true;
}
@@ -1310,49 +1311,51 @@
bool shouldDisableScrolling = isMainFrame && !webPage->mainFrameIsScrollable();
bool shouldHideScrollbars = shouldDisableScrolling;
IntRect fixedVisibleContentRect;
+ auto& coreFrame = *m_frame->coreFrame();
#if USE(COORDINATED_GRAPHICS)
- if (m_frame->coreFrame()->view())
- fixedVisibleContentRect = m_frame->coreFrame()->view()->fixedVisibleContentRect();
+ if (FrameView* frameView = coreFrame.view())
+ fixedVisibleContentRect = frameView->fixedVisibleContentRect();
if (shouldUseFixedLayout)
shouldHideScrollbars = true;
#endif
- const ResourceResponse& response = m_frame->coreFrame()->loader().documentLoader()->response();
- m_frameHasCustomContentProvider = isMainFrame && webPage->shouldUseCustomContentProviderForResponse(response);
+ const ResourceResponse& response = coreFrame.loader().documentLoader()->response();
+ m_frameHasCustomContentProvider = isMainFrame && webPage->shouldUseCustomContentProviderForResponse(response, coreFrame);
m_frameCameFromPageCache = false;
ScrollbarMode defaultScrollbarMode = shouldHideScrollbars ? ScrollbarAlwaysOff : ScrollbarAuto;
- m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent,
+ coreFrame.createView(webPage->size(), backgroundColor, isTransparent,
webPage->fixedLayoutSize(), fixedVisibleContentRect, shouldUseFixedLayout,
defaultScrollbarMode, /* lock */ shouldHideScrollbars, defaultScrollbarMode, /* lock */ shouldHideScrollbars);
+ FrameView* frameView = coreFrame.view();
if (int minimumLayoutWidth = webPage->minimumLayoutSize().width()) {
int minimumLayoutHeight = std::max(webPage->minimumLayoutSize().height(), 1);
int maximumSize = std::numeric_limits<int>::max();
- m_frame->coreFrame()->view()->enableAutoSizeMode(true, IntSize(minimumLayoutWidth, minimumLayoutHeight), IntSize(maximumSize, maximumSize));
+ frameView->enableAutoSizeMode(true, IntSize(minimumLayoutWidth, minimumLayoutHeight), IntSize(maximumSize, maximumSize));
if (webPage->autoSizingShouldExpandToViewHeight())
- m_frame->coreFrame()->view()->setAutoSizeFixedMinimumHeight(webPage->size().height());
+ frameView->setAutoSizeFixedMinimumHeight(webPage->size().height());
}
- m_frame->coreFrame()->view()->setProhibitsScrolling(shouldDisableScrolling);
- m_frame->coreFrame()->view()->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
+ frameView->setProhibitsScrolling(shouldDisableScrolling);
+ frameView->setVisualUpdatesAllowedByClient(!webPage->shouldExtendIncrementalRenderingSuppression());
#if PLATFORM(COCOA)
- m_frame->coreFrame()->view()->setViewExposedRect(webPage->drawingArea()->viewExposedRect());
+ frameView->setViewExposedRect(webPage->drawingArea()->viewExposedRect());
#endif
#if PLATFORM(IOS)
- m_frame->coreFrame()->view()->setDelegatesScrolling(true);
+ frameView->setDelegatesScrolling(true);
#endif
if (webPage->scrollPinningBehavior() != DoNotPin)
- m_frame->coreFrame()->view()->setScrollPinningBehavior(webPage->scrollPinningBehavior());
+ frameView->setScrollPinningBehavior(webPage->scrollPinningBehavior());
#if USE(COORDINATED_GRAPHICS)
if (shouldUseFixedLayout) {
- m_frame->coreFrame()->view()->setDelegatesScrolling(shouldUseFixedLayout);
- m_frame->coreFrame()->view()->setPaintsEntireContents(shouldUseFixedLayout);
+ frameView->setDelegatesScrolling(shouldUseFixedLayout);
+ frameView->setPaintsEntireContents(shouldUseFixedLayout);
return;
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207442 => 207443)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-18 00:12:00 UTC (rev 207442)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-18 00:28:34 UTC (rev 207443)
@@ -4572,11 +4572,12 @@
frameView->setScrollingPerformanceLoggingEnabled(enabled);
}
-bool WebPage::canPluginHandleResponse(const ResourceResponse& response)
+bool WebPage::canPluginHandleResponse(const ResourceResponse& response, const Frame& mainFrame)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
+ ASSERT(mainFrame.isMainFrame());
uint32_t pluginLoadPolicy;
- bool allowOnlyApplicationPlugins = !m_mainFrame->coreFrame()->loader().subframeLoader().allowPlugins();
+ bool allowOnlyApplicationPlugins = !mainFrame.loader().subframeLoader().allowPlugins();
uint64_t pluginProcessToken;
String newMIMEType;
@@ -4588,14 +4589,19 @@
return !isBlockedPlugin && pluginProcessToken;
#else
UNUSED_PARAM(response);
+ UNUSED_PARAM(mainFrame);
return false;
#endif
}
-bool WebPage::shouldUseCustomContentProviderForResponse(const ResourceResponse& response)
+bool WebPage::shouldUseCustomContentProviderForResponse(const ResourceResponse& response, const Frame& mainFrame)
{
// If a plug-in exists that claims to support this response, it should take precedence over the custom content provider.
- return m_mimeTypesWithCustomContentProviders.contains(response.mimeType()) && !canPluginHandleResponse(response);
+ if (canPluginHandleResponse(response, mainFrame))
+ return false;
+
+ auto& mimeType = response.mimeType();
+ return mimeType.isNull() ? false : m_mimeTypesWithCustomContentProviders.contains(mimeType);
}
#if PLATFORM(COCOA)
@@ -5020,7 +5026,7 @@
if (MIMETypeRegistry::canShowMIMEType(MIMEType))
return true;
- if (m_mimeTypesWithCustomContentProviders.contains(MIMEType))
+ if (!MIMEType.isNull() && m_mimeTypesWithCustomContentProviders.contains(MIMEType))
return true;
const PluginData& pluginData = m_page->pluginData();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (207442 => 207443)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-18 00:12:00 UTC (rev 207442)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-18 00:28:34 UTC (rev 207443)
@@ -844,8 +844,7 @@
uint64_t nativeWindowHandle() { return m_nativeWindowHandle; }
#endif
- bool shouldUseCustomContentProviderForResponse(const WebCore::ResourceResponse&);
- bool canPluginHandleResponse(const WebCore::ResourceResponse& response);
+ bool shouldUseCustomContentProviderForResponse(const WebCore::ResourceResponse&, const WebCore::Frame& mainFrame);
bool asynchronousPluginInitializationEnabled() const { return m_asynchronousPluginInitializationEnabled; }
void setAsynchronousPluginInitializationEnabled(bool enabled) { m_asynchronousPluginInitializationEnabled = enabled; }
@@ -1225,6 +1224,8 @@
void setResourceCachingDisabled(bool);
void setUserInterfaceLayoutDirection(uint32_t);
+ bool canPluginHandleResponse(const WebCore::ResourceResponse&, const WebCore::Frame& mainFrame);
+
uint64_t m_pageID;
std::unique_ptr<WebCore::Page> m_page;
Modified: trunk/Tools/ChangeLog (207442 => 207443)
--- trunk/Tools/ChangeLog 2016-10-18 00:12:00 UTC (rev 207442)
+++ trunk/Tools/ChangeLog 2016-10-18 00:28:34 UTC (rev 207443)
@@ -1,3 +1,16 @@
+2016-10-17 Andy Estes <aes...@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 Tim Horton.
+
+ * 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:].
+
2016-10-17 Dean Jackson <d...@apple.com>
Allow creation of ExtendedColors and make Color immutable
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (207442 => 207443)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-18 00:12:00 UTC (rev 207442)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-18 00:28:34 UTC (rev 207443)
@@ -425,6 +425,7 @@
9B4F8FA7159D52DD002D9F94 /* HTMLCollectionNamedItem.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 9B4F8FA6159D52CA002D9F94 /* HTMLCollectionNamedItem.html */; };
9C64DC321D76198A004B598E /* YouTubePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */; };
A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */; };
+ A125478F1DB18B9400358564 /* LoadDataWithNilMIMEType.mm in Sources */ = {isa = PBXBuildFile; fileRef = A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */; };
A13EBBAA1B87428D00097110 /* WebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBA91B87428D00097110 /* WebProcessPlugIn.mm */; };
A13EBBAB1B87434600097110 /* PlatformUtilitiesCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */; };
A13EBBB01B87436F00097110 /* BundleParametersPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13EBBAE1B87436F00097110 /* BundleParametersPlugIn.mm */; };
@@ -1054,6 +1055,7 @@
9B79164F1BD89D0D00D50B8F /* FirstResponderScrollingPosition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FirstResponderScrollingPosition.mm; sourceTree = "<group>"; };
9C64DC311D76198A004B598E /* YouTubePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YouTubePluginReplacement.cpp; sourceTree = "<group>"; };
A1146A8A1D2D704F000FE710 /* ContentFiltering.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFiltering.mm; sourceTree = "<group>"; };
+ A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoadDataWithNilMIMEType.mm; sourceTree = "<group>"; };
A13EBB491B87339E00097110 /* TestWebKitAPI.wkbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestWebKitAPI.wkbundle; sourceTree = BUILT_PRODUCTS_DIR; };
A13EBB521B87346600097110 /* WebProcessPlugIn.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcessPlugIn.xcconfig; sourceTree = "<group>"; };
A13EBB541B8734E000097110 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1427,6 +1429,7 @@
7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */,
0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */,
+ A125478D1DB18B9400358564 /* LoadDataWithNilMIMEType.mm */,
);
name = "WebKit2 Cocoa";
path = WebKit2Cocoa;
@@ -2395,6 +2398,7 @@
37B47E301D64E7CA005F4EFF /* WKObject.mm in Sources */,
7CCE7EC01A411A7E00447C4C /* FragmentNavigation.mm in Sources */,
7CCE7EF61A411AE600447C4C /* FrameMIMETypeHTML.cpp in Sources */,
+ A125478F1DB18B9400358564 /* LoadDataWithNilMIMEType.mm in Sources */,
7CCE7EF71A411AE600447C4C /* FrameMIMETypePNG.cpp in Sources */,
7C83E0BD1D0A650C00FEBCF3 /* FullscreenTopContentInset.mm in Sources */,
CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm (0 => 207443)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadDataWithNilMIMEType.mm 2016-10-18 00:28:34 UTC (rev 207443)
@@ -0,0 +1,42 @@
+/*
+ * 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
