Title: [105102] branches/safari-534.54-branch/Source/WebCore
- Revision
- 105102
- Author
- [email protected]
- Date
- 2012-01-16 16:08:38 -0800 (Mon, 16 Jan 2012)
Log Message
Merge fix for 9593456.
Modified Paths
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (105101 => 105102)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-17 00:04:56 UTC (rev 105101)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-17 00:08:38 UTC (rev 105102)
@@ -1,3 +1,14 @@
+2012-01-04 Alexey Proskuryakov <[email protected]>
+
+ Reviewed by John Sullivan.
+
+ <rdar://problem/9593456> Many crashes at DocumentThreadableLoader::cancel
+
+ No tests, because we could not reproduce this.
+
+ * loader/DocumentThreadableLoader.cpp: (WebCore::DocumentThreadableLoader::cancel): Added
+ a null check.
+
2012-01-16 Mark Rowe <[email protected]>
Merge r104378.
Modified: branches/safari-534.54-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp (105101 => 105102)
--- branches/safari-534.54-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp 2012-01-17 00:04:56 UTC (rev 105101)
+++ branches/safari-534.54-branch/Source/WebCore/loader/DocumentThreadableLoader.cpp 2012-01-17 00:08:38 UTC (rev 105102)
@@ -165,7 +165,11 @@
return;
m_loader->cancel();
- m_loader->clearClient();
+
+ // It is not clear how this happens, but reports indicate that m_loader can be null here.
+ if (m_loader)
+ m_loader->clearClient();
+
m_loader = 0;
m_client = 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
