Title: [224644] trunk/Source/WebCore
Revision
224644
Author
commit-qu...@webkit.org
Date
2017-11-09 12:58:15 -0800 (Thu, 09 Nov 2017)

Log Message

ServiceWorker ResourceResponse should not assert in platformCertificateInfo()
https://bugs.webkit.org/show_bug.cgi?id=179486

Patch by Youenn Fablet <you...@apple.com> on 2017-11-09
Reviewed by Chris Dumez.

No change of behavior.
In case a Response is returned by Service Worker, there may be no related internal response.
In that case, platformCertificateInfo is returning an empty CertificateInfo.

* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::platformCertificateInfo const):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (224643 => 224644)


--- trunk/Source/WebCore/ChangeLog	2017-11-09 20:56:27 UTC (rev 224643)
+++ trunk/Source/WebCore/ChangeLog	2017-11-09 20:58:15 UTC (rev 224644)
@@ -1,3 +1,17 @@
+2017-11-09  Youenn Fablet  <you...@apple.com>
+
+        ServiceWorker ResourceResponse should not assert in platformCertificateInfo()
+        https://bugs.webkit.org/show_bug.cgi?id=179486
+
+        Reviewed by Chris Dumez.
+
+        No change of behavior.
+        In case a Response is returned by Service Worker, there may be no related internal response.
+        In that case, platformCertificateInfo is returning an empty CertificateInfo.
+
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+        (WebCore::ResourceResponse::platformCertificateInfo const):
+
 2017-11-09  Zalan Bujtas  <za...@apple.com>
 
         [LayoutState cleanup] Remove conditional push from RenderTableSection::calcRowLogicalHeight

Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (224643 => 224644)


--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm	2017-11-09 20:56:27 UTC (rev 224643)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm	2017-11-09 20:58:15 UTC (rev 224644)
@@ -76,10 +76,10 @@
 CertificateInfo ResourceResponse::platformCertificateInfo() const
 {
 #if USE(CFURLCONNECTION)
-    ASSERT(m_cfResponse);
+    ASSERT(m_cfResponse || source() == Source::ServiceWorker);
     CFURLResponseRef cfResponse = m_cfResponse.get();
 #else
-    ASSERT(m_nsResponse);
+    ASSERT(m_nsResponse || source() == Source::ServiceWorker);
     CFURLResponseRef cfResponse = [m_nsResponse _CFURLResponse];
 #endif
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to