Title: [145939] branches/safari-536.30-branch/Source/WebCore
- Revision
- 145939
- Author
- lforsch...@apple.com
- Date
- 2013-03-15 14:26:42 -0700 (Fri, 15 Mar 2013)
Log Message
Merge 132287. <rdar://problem/13335000>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145938 => 145939)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-15 21:16:48 UTC (rev 145938)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-15 21:26:42 UTC (rev 145939)
@@ -1,5 +1,24 @@
2013-03-15 Lucas Forschler <lforsch...@apple.com>
+ Merge r132287
+
+ 2012-10-23 Nate Chapin <jap...@chromium.org>
+
+ Crash in WebCore::SubresourceLoader::willSendRequest.
+ https://bugs.webkit.org/show_bug.cgi?id=100147
+
+ Reviewed by Abhishek Arya.
+
+ No new tests. There is a test case that should cover this, but it doesn't
+ work correctly on many platforms due to its use of testRunner.addURLToRedirect().
+ See http/tests/loading/cross-origin-XHR-willLoadRequest.html.
+ Tested manually on http://www.nick.co.uk/shows/spongebob
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequest):
+
+2013-03-15 Lucas Forschler <lforsch...@apple.com>
+
Merge r131709
2012-10-18 MORITA Hajime <morr...@google.com>
Modified: branches/safari-536.30-branch/Source/WebCore/loader/SubresourceLoader.cpp (145938 => 145939)
--- branches/safari-536.30-branch/Source/WebCore/loader/SubresourceLoader.cpp 2013-03-15 21:16:48 UTC (rev 145938)
+++ branches/safari-536.30-branch/Source/WebCore/loader/SubresourceLoader.cpp 2013-03-15 21:26:42 UTC (rev 145939)
@@ -144,6 +144,7 @@
{
// Store the previous URL because the call to ResourceLoader::willSendRequest will modify it.
KURL previousURL = request().url();
+ RefPtr<SubresourceLoader> protect(this);
ResourceLoader::willSendRequest(newRequest, redirectResponse);
if (!previousURL.isNull() && !newRequest.isNull() && previousURL != newRequest.url()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
