Title: [124828] branches/safari-536.26-branch/Source/WebCore
- Revision
- 124828
- Author
- [email protected]
- Date
- 2012-08-06 18:19:05 -0700 (Mon, 06 Aug 2012)
Log Message
Merged r121803. <rdar://problem/11968346>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124827 => 124828)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-07 01:14:51 UTC (rev 124827)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-07 01:19:05 UTC (rev 124828)
@@ -1,5 +1,21 @@
2012-08-06 Lucas Forschler <[email protected]>
+ Merge 121803
+
+ 2012-07-03 Nate Chapin <[email protected]>
+
+ Protect this DocumentThreadableLoader in cancel() to handle reentrancy properly.
+ https://bugs.webkit.org/show_bug.cgi?id=90483
+
+ Reviewed by Abhishek Arya.
+
+ No new tests, covered by http/tests/xmlhttprequest/reentrant-cancel.html
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::cancel):
+
+2012-08-06 Lucas Forschler <[email protected]>
+
Merge 120845
2012-06-20 Nate Chapin <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp (124827 => 124828)
--- branches/safari-536.26-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp 2012-08-07 01:14:51 UTC (rev 124827)
+++ branches/safari-536.26-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp 2012-08-07 01:19:05 UTC (rev 124828)
@@ -146,7 +146,9 @@
void DocumentThreadableLoader::cancel()
{
- // Cacnel can re-enter and m_resource might be null here as a result.
+ RefPtr<DocumentThreadableLoader> protect(this);
+
+ // Cancel can re-enter and m_resource might be null here as a result.
if (m_client && m_resource) {
ResourceError error(errorDomainWebKitInternal, 0, m_resource->url(), "Load cancelled");
error.setIsCancellation(true);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
