Changeset 80586 in webkit

Timestamp:

Mar 8, 2011 1:42:32 PM (13 years ago)

Author:

jberlin@webkit.org

Message:

Crash in CFNetwork visiting google.com
​https://bugs.webkit.org/show_bug.cgi?id=55958

Reviewed by Anders Carlsson.

Source/WebKit2:

• Shared/API/c/cf/WKURLResponseCF.cpp:

(WKURLResponseCopyCFURLResponse):
If the response to copy is null, return 0;

Tools:

Add a test for not trying to copy a null CFURLResponse.

• TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp: Added.

(TestWebKitAPI::TEST):

• TestWebKitAPI/win/TestWebKitAPI.vcproj:

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp (added)
• Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-08  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Crash in CFNetwork visiting google.com
+        https://bugs.webkit.org/show_bug.cgi?id=55958
+
+        * Shared/API/c/cf/WKURLResponseCF.cpp:
+        (WKURLResponseCopyCFURLResponse):
+        If the response to copy is null, return 0;
+
 2011-03-08  John Sullivan  <sullivan@apple.com>
 

trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.cpp

@@ -34 +34 @@
 WKURLResponseRef WKURLResponseCreateWithCFURLResponse(CFURLResponseRef urlResponse)
 {
+    if (!urlResponse)
+        return 0;
+
     CFURLResponseRef copiedURLResponse = CFURLResponseCreateCopy(kCFAllocatorDefault, urlResponse);
     RefPtr<WebURLResponse> response = WebURLResponse::create(copiedURLResponse);
@@ -41 +44 @@
 CFURLResponseRef WKURLResponseCopyCFURLResponse(CFAllocatorRef alloc, WKURLResponseRef urlResponse)
 {
+    if (!urlResponse)
+        return 0;
+
+    PlatformResponse platformURLResponse = toImpl(urlResponse)->platformResponse();
+    if (!platformURLResponse)
+        return 0;
+
     return CFURLResponseCreateCopy(alloc, toImpl(urlResponse)->platformResponse());
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-08  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Crash in CFNetwork visiting google.com
+        https://bugs.webkit.org/show_bug.cgi?id=55958
+
+        Add a test for not trying to copy a null CFURLResponse.
+
+        * TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp: Added.
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/win/TestWebKitAPI.vcproj:
+
 2011-03-08  Hayato Ito  <hayato@chromium.org>
 

trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj

@@ -449 +449 @@
                                 </File>
                                 <File
+                                        RelativePath="..\Tests\WebKit2\HitTestResultNodeHandle.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\Tests\WebKit2\icon.png"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\Tests\WebKit2\HitTestResultNodeHandle.cpp"
                                         >
                                 </File>
@@ -517 +517 @@
                                         <File
                                                 RelativePath="..\Tests\WebKit2\win\AltKeyGeneratesWMSysCommand.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\Tests\WebKit2\win\DoNotCopyANullCFURLResponse.cpp"
                                                 >
                                         </File>