Title: [104225] branches/safari-534.54-branch/Source/WebCore
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104224 => 104225)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:37:35 UTC (rev 104224)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:39:10 UTC (rev 104225)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 98796
+
+ 2011-10-28 Ryosuke Niwa <[email protected]>
+
+ Potential crash in ReplaceNodeWithSpanCommand
+ https://bugs.webkit.org/show_bug.cgi?id=71145
+
+ Reviewed by Ojan Vafai.
+
+ Fix a potential crash without tests because we don't have a reduction.
+
+ * editing/ReplaceNodeWithSpanCommand.cpp:
+ (WebCore::swapInNodePreservingAttributesAndChildren):
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 98763
2011-10-28 Ken Buchanan <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp (104224 => 104225)
--- branches/safari-534.54-branch/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp 2012-01-05 22:37:35 UTC (rev 104224)
+++ branches/safari-534.54-branch/Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp 2012-01-05 22:39:10 UTC (rev 104225)
@@ -52,7 +52,7 @@
{
ASSERT(nodeToReplace->inDocument());
ExceptionCode ec = 0;
- ContainerNode* parentNode = nodeToReplace->parentNode();
+ RefPtr<ContainerNode> parentNode = nodeToReplace->parentNode();
parentNode->insertBefore(newNode, nodeToReplace, ec);
ASSERT(!ec);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
