<!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>[206801] 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/206801">206801</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-10-04 18:02:27 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Crash in WebResourceLoaderQuickLookDelegate when the client cancels the navigation to a QuickLook resource
https://bugs.webkit.org/show_bug.cgi?id=162950
<rdar://problem/23759114>
Reviewed by Brady Eidson.
Source/WebCore:
When we receive data from QLPreviewConverter for the first time, we call
ResourceLoader::didReceiveResponse() with the preview NSURLResponse from QuickLook. If the
client decides to cancel this navigation in decidePolicyForResponse(),
WebResourceLoaderQuickLookDelegate will end up with a null _resourceLoader after
didReceiveResponse() returns. This change adds null checks in the methods that use
_resourceLoader after calling -_sendDidReceiveResponseIfNecessary.
New API test: QuickLook.CancelNavigationAfterResponse
* platform/network/ios/QuickLook.mm:
(-[WebResourceLoaderQuickLookDelegate connection:didReceiveDataArray:]): Changed to only
call ResourceLoader::didReceiveDataArray() if _resourceLoader is non-null.
(-[WebResourceLoaderQuickLookDelegate connection:didReceiveData:lengthReceived:]): Ditto for
ResourceLoader::didReceiveData().
(-[WebResourceLoaderQuickLookDelegate connection:didFailWithError:]): Ditto for
ResourceLoader::didFail().
Tools:
Added a new API test.
* TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm: Sorted imports and removed redundant
initialization of static bools.
(runTest): Factored out the common test logic between QuickLook.NavigationDelegate and
QuickLook.CancelNavigationAfterResponse.
(TEST): Added QuickLook.CancelNavigationAfterResponse.
(-[QuickLookDecidePolicyDelegate
webView:decidePolicyForNavigationResponse:decisionHandler:]): Canceled the navigation.
(-[QuickLookDecidePolicyDelegate webView:didFailProvisionalNavigation:withError:]): Set
isDone to true.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookmm">trunk/Source/WebCore/platform/network/ios/QuickLook.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaQuickLookmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206800 => 206801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-05 00:42:37 UTC (rev 206800)
+++ trunk/Source/WebCore/ChangeLog 2016-10-05 01:02:27 UTC (rev 206801)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-10-04 Andy Estes <aestes@apple.com>
+
+ [iOS] Crash in WebResourceLoaderQuickLookDelegate when the client cancels the navigation to a QuickLook resource
+ https://bugs.webkit.org/show_bug.cgi?id=162950
+ <rdar://problem/23759114>
+
+ Reviewed by Brady Eidson.
+
+ When we receive data from QLPreviewConverter for the first time, we call
+ ResourceLoader::didReceiveResponse() with the preview NSURLResponse from QuickLook. If the
+ client decides to cancel this navigation in decidePolicyForResponse(),
+ WebResourceLoaderQuickLookDelegate will end up with a null _resourceLoader after
+ didReceiveResponse() returns. This change adds null checks in the methods that use
+ _resourceLoader after calling -_sendDidReceiveResponseIfNecessary.
+
+ New API test: QuickLook.CancelNavigationAfterResponse
+
+ * platform/network/ios/QuickLook.mm:
+ (-[WebResourceLoaderQuickLookDelegate connection:didReceiveDataArray:]): Changed to only
+ call ResourceLoader::didReceiveDataArray() if _resourceLoader is non-null.
+ (-[WebResourceLoaderQuickLookDelegate connection:didReceiveData:lengthReceived:]): Ditto for
+ ResourceLoader::didReceiveData().
+ (-[WebResourceLoaderQuickLookDelegate connection:didFailWithError:]): Ditto for
+ ResourceLoader::didFail().
+
</ins><span class="cx"> 2016-10-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for KeyboardEvent.isComposing attribute
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.mm (206800 => 206801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2016-10-05 00:42:37 UTC (rev 206800)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2016-10-05 01:02:27 UTC (rev 206801)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -309,7 +309,8 @@
</span><span class="cx"> if (_hasFailed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _resourceLoader->didReceiveDataArray(reinterpret_cast<CFArrayRef>(dataArray));
</del><ins>+ if (_resourceLoader)
+ _resourceLoader->didReceiveDataArray(reinterpret_cast<CFArrayRef>(dataArray));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -327,7 +328,9 @@
</span><span class="cx"> // ResourceHandleMac.cpp added for a different bug.
</span><span class="cx"> if (![data length])
</span><span class="cx"> return;
</span><del>- _resourceLoader->didReceiveData(reinterpret_cast<const char*>([data bytes]), [data length], lengthReceived, DataPayloadBytes);
</del><ins>+
+ if (_resourceLoader)
+ _resourceLoader->didReceiveData(reinterpret_cast<const char*>([data bytes]), [data length], lengthReceived, DataPayloadBytes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)connectionDidFinishLoading:(NSURLConnection *)connection
</span><span class="lines">@@ -348,7 +351,8 @@
</span><span class="cx"> if (_hasFailed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _resourceLoader->didFail(ResourceError(error));
</del><ins>+ if (_resourceLoader)
+ _resourceLoader->didFail(ResourceError(error));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)detachHandle
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206800 => 206801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-05 00:42:37 UTC (rev 206800)
+++ trunk/Tools/ChangeLog 2016-10-05 01:02:27 UTC (rev 206801)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-04 Andy Estes <aestes@apple.com>
+
+ [iOS] Crash in WebResourceLoaderQuickLookDelegate when the client cancels the navigation to a QuickLook resource
+ https://bugs.webkit.org/show_bug.cgi?id=162950
+ <rdar://problem/23759114>
+
+ Reviewed by Brady Eidson.
+
+ Added a new API test.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm: Sorted imports and removed redundant
+ initialization of static bools.
+ (runTest): Factored out the common test logic between QuickLook.NavigationDelegate and
+ QuickLook.CancelNavigationAfterResponse.
+ (TEST): Added QuickLook.CancelNavigationAfterResponse.
+ (-[QuickLookDecidePolicyDelegate
+ webView:decidePolicyForNavigationResponse:decisionHandler:]): Canceled the navigation.
+ (-[QuickLookDecidePolicyDelegate webView:didFailProvisionalNavigation:withError:]): Set
+ isDone to true.
+
</ins><span class="cx"> 2016-10-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add the support for running ES6SampleBench to run-benchmark
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm (206800 => 206801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm 2016-10-05 00:42:37 UTC (rev 206800)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/QuickLook.mm 2016-10-05 01:02:27 UTC (rev 206801)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,14 +27,14 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "PlatformUtilities.h"
</ins><span class="cx"> #import <WebKit/WKNavigationDelegatePrivate.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><del>-#import "PlatformUtilities.h"
</del><span class="cx">
</span><del>-static bool isDone = false;
-static bool didStartQuickLookLoad = false;
-static bool didFinishQuickLookLoad = false;
</del><ins>+static bool isDone;
+static bool didStartQuickLookLoad;
+static bool didFinishQuickLookLoad;
</ins><span class="cx">
</span><span class="cx"> @interface QuickLookNavigationDelegate : NSObject <WKNavigationDelegatePrivate>
</span><span class="cx"> @end
</span><span class="lines">@@ -61,17 +61,44 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-TEST(QuickLook, NavigationDelegate)
</del><ins>+static void runTest(Class navigationDelegateClass)
</ins><span class="cx"> {
</span><span class="cx"> auto webView = adoptNS([[WKWebView alloc] init]);
</span><del>- auto navigationDelegate = adoptNS([[QuickLookNavigationDelegate alloc] init]);
</del><ins>+ auto navigationDelegate = adoptNS([[navigationDelegateClass alloc] init]);
</ins><span class="cx"> [webView setNavigationDelegate:navigationDelegate.get()];
</span><span class="cx"> [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"pages" withExtension:@"pages" subdirectory:@"TestWebKitAPI.resources"]]];
</span><span class="cx">
</span><ins>+ isDone = false;
</ins><span class="cx"> TestWebKitAPI::Util::run(&isDone);
</span><ins>+}
</ins><span class="cx">
</span><ins>+TEST(QuickLook, NavigationDelegate)
+{
+ runTest([QuickLookNavigationDelegate class]);
</ins><span class="cx"> EXPECT_TRUE(didStartQuickLookLoad);
</span><span class="cx"> EXPECT_TRUE(didFinishQuickLookLoad);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@interface QuickLookDecidePolicyDelegate : NSObject <WKNavigationDelegate>
+@end
+
+@implementation QuickLookDecidePolicyDelegate
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
+{
+ decisionHandler(WKNavigationResponsePolicyCancel);
+}
+
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
+{
+ isDone = true;
+}
+
+@end
+
+TEST(QuickLook, CancelNavigationAfterResponse)
+{
+ runTest([QuickLookDecidePolicyDelegate class]);
+}
+
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>