Title: [105119] branches/safari-534.54-branch/Source/WebCore
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (105118 => 105119)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-17 01:49:01 UTC (rev 105118)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-17 02:00:48 UTC (rev 105119)
@@ -1,5 +1,23 @@
2012-01-16 Mark Rowe <[email protected]>
+ Merge r99591.
+
+ 2011-11-08 Darin Adler <[email protected]>
+
+ Speculative fix for crashes seen in DocumentWriter::deprecatedFrameEncoding
+ https://bugs.webkit.org/show_bug.cgi?id=71828
+
+ Reviewed by Nate Chapin.
+
+ No new tests; not sure how to reproduce this, but crash traces indicate it
+ is an otherwise-harmless null dereference.
+
+ * loader/DocumentWriter.cpp:
+ (WebCore::DocumentWriter::deprecatedFrameEncoding):
+ Handle null document the same as a document without a URL.
+
+2012-01-16 Mark Rowe <[email protected]>
+
Merge r103860.
2011-12-31 Dan Bernstein <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/loader/DocumentWriter.cpp (105118 => 105119)
--- branches/safari-534.54-branch/Source/WebCore/loader/DocumentWriter.cpp 2012-01-17 01:49:01 UTC (rev 105118)
+++ branches/safari-534.54-branch/Source/WebCore/loader/DocumentWriter.cpp 2012-01-17 02:00:48 UTC (rev 105119)
@@ -251,7 +251,11 @@
String DocumentWriter::deprecatedFrameEncoding() const
{
- return m_frame->document()->url().isEmpty() ? m_encoding : encoding();
+ Document* document = m_frame->document();
+ if (!document || document->url().isEmpty())
+ return m_encoding;
+
+ return encoding();
}
void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
