Changeset 152196 in webkit

Timestamp:

Jun 28, 2013 4:57:16 PM (11 years ago)

Author:

ap@apple.com

Message:

[Mac] Crash when loading is stopped from -didReceiveResponse
​https://bugs.webkit.org/show_bug.cgi?id=118209
<rdar://problem/14259249>

Reviewed by Brady Eidson.

Test: TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm.

• loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::didReceiveResponse): Added yet another check for reachedTerminalState().

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/SubresourceLoader.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (6 diffs)
• Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.html (added)
• Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-28  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Crash when loading is stopped from -didReceiveResponse
+        https://bugs.webkit.org/show_bug.cgi?id=118209
+        <rdar://problem/14259249>
+
+        Reviewed by Brady Eidson.
+
+        Test: TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm.
+
+        * loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::didReceiveResponse):
+        Added yet another check for reachedTerminalState().
+
 2013-06-28  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -189 +189 @@
     if (reachedTerminalState())
         return;
+
     ResourceLoader::didReceiveResponse(response);
+    if (reachedTerminalState())
+        return;
 
     // FIXME: Main resources have a different set of rules for multipart than images do.

trunk/Tools/ChangeLog

@@ +1 @@
+2013-06-28  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Crash when loading is stopped from -didReceiveResponse
+        https://bugs.webkit.org/show_bug.cgi?id=118209
+        <rdar://problem/14259249>
+
+        Reviewed by Brady Eidson.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.html: Added.
+        * TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm: Added.
+        (-[StopLoadingFromDidReceiveResponse webView:resource:didReceiveResponse:fromDataSource:]):
+        (TestWebKitAPI::TEST):
+
 2013-06-28  Andy Estes  <aestes@apple.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -208 +208 @@
                 E1220DA0155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1220D9F155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm */; };
                 E1220DCA155B28AA0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */; };
+                E194E1BB177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = E194E1BA177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm */; };
+                E194E1BD177E53C7009C4D4E /* StopLoadingFromDidReceiveResponse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E194E1BC177E534A009C4D4E /* StopLoadingFromDidReceiveResponse.html */; };
                 E490296814E2E3A4002BEDD1 /* TypingStyleCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */; };
                 F660AA0D15A5F061003A1243 /* GetInjectedBundleInitializationUserDataCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F660AA0C15A5F061003A1243 /* GetInjectedBundleInitializationUserDataCallback.cpp */; };
@@ -288 +290 @@
                                 BC909784125571CF00083756 /* simple.html in Copy Resources */,
                                 C01A23F21266156700C9ED55 /* spacebar-scrolling.html in Copy Resources */,
+                                E194E1BD177E53C7009C4D4E /* StopLoadingFromDidReceiveResponse.html in Copy Resources */,
                                 C540F784152E5A9A00A40C8C /* verboseMarkup.html in Copy Resources */,
                                 A5E2027515B21F6E00C13E14 /* WindowlessWebViewWithMedia.html in Copy Resources */,
@@ -517 +520 @@
                 E1220D9F155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryCacheDisableWithinResourceLoadDelegate.mm; sourceTree = "<group>"; };
                 E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = MemoryCacheDisableWithinResourceLoadDelegate.html; sourceTree = "<group>"; };
+                E194E1BA177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StopLoadingFromDidReceiveResponse.mm; sourceTree = "<group>"; };
+                E194E1BC177E534A009C4D4E /* StopLoadingFromDidReceiveResponse.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = StopLoadingFromDidReceiveResponse.html; sourceTree = "<group>"; };
                 E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TypingStyleCrash.mm; sourceTree = "<group>"; };
                 F3FC3EE213678B7300126A65 /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -892 +897 @@
                                 1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */,
                                 A5E2027215B2181900C13E14 /* WindowlessWebViewWithMedia.mm */,
+                                E194E1BA177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm */,
                         );
                         path = mac;
@@ -916 +922 @@
                                 A57A34F116AF69E200C2501F /* PageVisibilityStateWithWindowChanges.html */,
                                 52B8CF9415868CF000281053 /* SetDocumentURI.html */,
+                                E194E1BC177E534A009C4D4E /* StopLoadingFromDidReceiveResponse.html */,
                                 C540F783152E5A7800A40C8C /* verboseMarkup.html */,
                                 A5E2027015B2180600C13E14 /* WindowlessWebViewWithMedia.html */,
@@ -1149 +1156 @@
                                 C540F776152E4DA000A40C8C /* SimplifyMarkup.mm in Sources */,
                                 C02B77F2126612140026BF0F /* SpacebarScrolling.cpp in Sources */,
+                                E194E1BB177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm in Sources */,
                                 81B50193140F232300D9EB58 /* StringBuilder.cpp in Sources */,
                                 3799AD3A14120A43005EB0C6 /* StringByEvaluatingJavaScriptFromString.mm in Sources */,