Title: [177071] branches/safari-600.1.4.13-branch/Source/WebCore
- Revision
- 177071
- Author
- [email protected]
- Date
- 2014-12-10 09:10:41 -0800 (Wed, 10 Dec 2014)
Log Message
Merged r175974. rdar://problem/19132083
Modified Paths
Diff
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog (177070 => 177071)
--- branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 17:08:40 UTC (rev 177070)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 17:10:41 UTC (rev 177071)
@@ -1,5 +1,23 @@
2014-12-10 Babak Shafiei <[email protected]>
+ Merge r175974.
+
+ 2014-11-11 David Kilzer <[email protected]>
+
+ Protect Document in ProcessingInstruction::setXSLStyleSheet()
+ <http://webkit.org/b/138621>
+
+ Reviewed by Andreas Kling.
+
+ The patch is inspired by the following Blink revision by
+ <[email protected]>:
+ <https://src.chromium.org/viewvc/blink?view=rev&revision=182309>
+
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::setXSLStyleSheet):
+
+2014-12-10 Babak Shafiei <[email protected]>
+
Merge r175347.
2014-10-29 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/dom/ProcessingInstruction.cpp (177070 => 177071)
--- branches/safari-600.1.4.13-branch/Source/WebCore/dom/ProcessingInstruction.cpp 2014-12-10 17:08:40 UTC (rev 177070)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/dom/ProcessingInstruction.cpp 2014-12-10 17:10:41 UTC (rev 177071)
@@ -215,6 +215,7 @@
{
ASSERT(m_isXSL);
m_sheet = XSLStyleSheet::create(this, href, baseURL);
+ Ref<Document> protect(document());
parseStyleSheet(sheet);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
