Prevent checked_cf_cast crashes in ResourceResponse::platformCertificateInfo
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2019 18:45:31 +0000 (18:45 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2019 18:45:31 +0000 (18:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195686

Reviewed by Tim Horton.

This covers up a type confusion bug on some OSes until rdar://problem/48853137 is resolved.

* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/network/cocoa/ResourceResponseCocoa.mm:

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

Source/WebCore/ChangeLog
Source/WebCore/SourcesCocoa.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm

index deabe5e..b1346c3 100644 (file)
@@ -1,3 +1,16 @@
+2019-03-13  Alex Christensen  <achristensen@webkit.org>
+
+        Prevent checked_cf_cast crashes in ResourceResponse::platformCertificateInfo
+        https://bugs.webkit.org/show_bug.cgi?id=195686
+
+        Reviewed by Tim Horton.
+
+        This covers up a type confusion bug on some OSes until rdar://problem/48853137 is resolved.
+
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+
 2019-03-13  Thibault Saunier  <tsaunier@igalia.com>
 
         [GStreamer][WebRTC] Add support for omxh264enc encoder
index 79a97d1..a98db82 100644 (file)
@@ -519,7 +519,7 @@ platform/network/cocoa/NetworkLoadMetrics.mm
 platform/network/cocoa/NetworkStorageSessionCocoa.mm
 platform/network/cocoa/ProtectionSpaceCocoa.mm
 platform/network/cocoa/ResourceRequestCocoa.mm
-platform/network/cocoa/ResourceResponseCocoa.mm
+platform/network/cocoa/ResourceResponseCocoa.mm @no-unify // Unsafe to unify until rdar://problem/48853137 is resolved
 platform/network/cocoa/WebCoreNSURLSession.mm @no-unify
 
 platform/network/ios/NetworkStateNotifierIOS.mm
index c4fef86..6764cff 100644 (file)
                5A574F29131DB96D00471B88 /* QuotesData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A574F27131DB96D00471B88 /* QuotesData.h */; };
                5B30695D18B3D3450099D5E8 /* WebGLDrawBuffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B30695A18B3D3450099D5E8 /* WebGLDrawBuffers.cpp */; };
                5B30695E18B3D3450099D5E8 /* WebGLDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B30695B18B3D3450099D5E8 /* WebGLDrawBuffers.h */; };
+               5C2B1AEC22397EBC00B91CF7 /* ResourceResponseCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */; };
                5C4304B0191AC908000E2BC0 /* EXTShaderTextureLOD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C4304AD191AC908000E2BC0 /* EXTShaderTextureLOD.cpp */; };
                5C4304B1191AC908000E2BC0 /* EXTShaderTextureLOD.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4304AE191AC908000E2BC0 /* EXTShaderTextureLOD.h */; };
                5C4304B6191AEF46000E2BC0 /* JSEXTShaderTextureLOD.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4304B4191AEF46000E2BC0 /* JSEXTShaderTextureLOD.h */; };
                                CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
                                CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
                                419242492127B93E00634FCF /* RealtimeOutgoingVideoSourceCocoa.mm in Sources */,
+                               5C2B1AEC22397EBC00B91CF7 /* ResourceResponseCocoa.mm in Sources */,
                                316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
                                BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */,
                                BCEF869F0E844E9D00A85CD5 /* ScrollbarThemeMac.mm in Sources */,
index 16f11d1..3241c66 100644 (file)
@@ -111,10 +111,6 @@ CertificateInfo ResourceResponse::platformCertificateInfo() const
 #endif
 }
 
-static CFStringRef const commonHeaderFields[] = {
-    CFSTR("Age"), CFSTR("Cache-Control"), CFSTR("Content-Type"), CFSTR("Date"), CFSTR("Etag"), CFSTR("Expires"), CFSTR("Last-Modified"), CFSTR("Pragma")
-};
-
 NSURLResponse *ResourceResponse::nsURLResponse() const
 {
     if (!m_nsResponse && !m_isNull)