Title: [121803] trunk/Source/WebCore
- Revision
- 121803
- Author
- [email protected]
- Date
- 2012-07-03 14:37:28 -0700 (Tue, 03 Jul 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121802 => 121803)
--- trunk/Source/WebCore/ChangeLog 2012-07-03 21:02:29 UTC (rev 121802)
+++ trunk/Source/WebCore/ChangeLog 2012-07-03 21:37:28 UTC (rev 121803)
@@ -1,3 +1,15 @@
+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-07-03 Tony Chang <[email protected]>
[chromium] Unreviewed, update .gitignore to handle VS2010 files.
Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (121802 => 121803)
--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2012-07-03 21:02:29 UTC (rev 121802)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2012-07-03 21:37:28 UTC (rev 121803)
@@ -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.cgi/webkit-changes
