Changeset 259605 in webkit

Timestamp:

Apr 6, 2020, 4:05:26 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r259580. rdar://problem/61352477

CrashTracer: MobileSafari at WebKit: WebKit::SystemPreviewController::updateProgress
​https://bugs.webkit.org/show_bug.cgi?id=210040
rdar://51410841

Reviewed by Darin Adler.

It appears that the SystemPreviewController on WebPageProxy can
become null causing a call to an in-progress download to crash
as it tries to talk to the QuickLook delegate. Guard against this
by checking the SystemPreviewController each time.

• UIProcess/Cocoa/DownloadClient.mm: (WebKit::systemPreviewController): (WebKit::DownloadClient::didReceiveResponse): (WebKit::DownloadClient::didReceiveData): (WebKit::DownloadClient::processDidCrash): (WebKit::DownloadClient::didFinish): (WebKit::DownloadClient::didFail): (WebKit::DownloadClient::didCancel):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@259580 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/DownloadClient.mm (modified) (7 diffs)

branches/safari-609-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-06  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r259580. rdar://problem/61352477
+
+    CrashTracer: MobileSafari at WebKit: WebKit::SystemPreviewController::updateProgress
+    https://bugs.webkit.org/show_bug.cgi?id=210040
+    rdar://51410841
+    
+    Reviewed by Darin Adler.
+    
+    It appears that the SystemPreviewController on WebPageProxy can
+    become null causing a call to an in-progress download to crash
+    as it tries to talk to the QuickLook delegate. Guard against this
+    by checking the SystemPreviewController each time.
+    
+    * UIProcess/Cocoa/DownloadClient.mm:
+    (WebKit::systemPreviewController):
+    (WebKit::DownloadClient::didReceiveResponse):
+    (WebKit::DownloadClient::didReceiveData):
+    (WebKit::DownloadClient::processDidCrash):
+    (WebKit::DownloadClient::didFinish):
+    (WebKit::DownloadClient::didFail):
+    (WebKit::DownloadClient::didCancel):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259580 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-04-06  Dean Jackson  <dino@apple.com>
+
+            CrashTracer: MobileSafari at WebKit: WebKit::SystemPreviewController::updateProgress
+            https://bugs.webkit.org/show_bug.cgi?id=210040
+            rdar://51410841
+
+            Reviewed by Darin Adler.
+
+            It appears that the SystemPreviewController on WebPageProxy can
+            become null causing a call to an in-progress download to crash
+            as it tries to talk to the QuickLook delegate. Guard against this
+            by checking the SystemPreviewController each time.
+
+            * UIProcess/Cocoa/DownloadClient.mm:
+            (WebKit::systemPreviewController):
+            (WebKit::DownloadClient::didReceiveResponse):
+            (WebKit::DownloadClient::didReceiveData):
+            (WebKit::DownloadClient::processDidCrash):
+            (WebKit::DownloadClient::didFinish):
+            (WebKit::DownloadClient::didFail):
+            (WebKit::DownloadClient::didCancel):
+
 2020-04-06  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm

@@ -66 +66 @@
 }
 
+#if USE(SYSTEM_PREVIEW)
+static SystemPreviewController* systemPreviewController(DownloadProxy& downloadProxy)
+{
+    auto* page = downloadProxy.originatingPage();
+    if (!page)
+        return nullptr;
+    return page->systemPreviewController();
+}
+#endif
+
 void DownloadClient::didStart(DownloadProxy& downloadProxy)
 {
@@ -89 +99 @@
         downloadProxy.setExpectedContentLength(response.expectedContentLength());
         downloadProxy.setBytesLoaded(0);
-        if (auto* webPage = downloadProxy.originatingPage())
-            webPage->systemPreviewController()->updateProgress(0);
+        if (auto* controller = systemPreviewController(downloadProxy))
+            controller->updateProgress(0);
         return;
     }
@@ -104 +114 @@
     if (downloadProxy.isSystemPreviewDownload()) {
         downloadProxy.setBytesLoaded(downloadProxy.bytesLoaded() + length);
-        if (auto* webPage = downloadProxy.originatingPage())
-            webPage->systemPreviewController()->updateProgress(static_cast<float>(downloadProxy.bytesLoaded()) / downloadProxy.expectedContentLength());
+        if (auto* controller = systemPreviewController(downloadProxy))
+            controller->updateProgress(static_cast<float>(downloadProxy.bytesLoaded()) / downloadProxy.expectedContentLength());
         return;
     }
@@ -165 +175 @@
 #if USE(SYSTEM_PREVIEW)
     if (downloadProxy.isSystemPreviewDownload()) {
-        if (auto* webPage = downloadProxy.originatingPage())
-            webPage->systemPreviewController()->cancel();
+        if (auto* controller = systemPreviewController(downloadProxy))
+            controller->cancel();
         releaseActivityTokenIfNecessary(downloadProxy);
         return;
@@ -210 +220 @@
 #if USE(SYSTEM_PREVIEW)
     if (downloadProxy.isSystemPreviewDownload()) {
-        if (auto* webPage = downloadProxy.originatingPage()) {
+        if (auto* controller = systemPreviewController(downloadProxy)) {
             WTF::URL destinationURL = WTF::URL::fileURLWithFileSystemPath(downloadProxy.destinationFilename());
             if (!destinationURL.fragmentIdentifier().length())
                 destinationURL.setFragmentIdentifier(downloadProxy.request().url().fragmentIdentifier());
-            webPage->systemPreviewController()->finish(destinationURL);
+            controller->finish(destinationURL);
         }
         releaseActivityTokenIfNecessary(downloadProxy);
@@ -229 +239 @@
 #if USE(SYSTEM_PREVIEW)
     if (downloadProxy.isSystemPreviewDownload()) {
-        if (auto* webPage = downloadProxy.originatingPage())
-            webPage->systemPreviewController()->fail(error);
+        if (auto* controller = systemPreviewController(downloadProxy))
+            controller->fail(error);
         releaseActivityTokenIfNecessary(downloadProxy);
         return;
@@ -244 +254 @@
 #if USE(SYSTEM_PREVIEW)
     if (downloadProxy.isSystemPreviewDownload()) {
-        if (auto* webPage = downloadProxy.originatingPage())
-            webPage->systemPreviewController()->cancel();
+        if (auto* controller = systemPreviewController(downloadProxy))
+            controller->cancel();
         releaseActivityTokenIfNecessary(downloadProxy);
         return;