Title: [282510] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 282510
- Author
- [email protected]
- Date
- 2021-09-16 01:40:44 -0700 (Thu, 16 Sep 2021)
Log Message
Merge r276546 - Crash in IndentOutdentCommand::outdentParagraph attempting to move a paragraph
https://bugs.webkit.org/show_bug.cgi?id=224909
Patch by Ian Gilbert <[email protected]> on 2021-04-23
Reviewed by Ryosuke Niwa.
Added check inside IndentOutdentCommand::outdentParagraph to ensure that inserting a
HTMLBRElement was successful before attempting to move a paragraph to that node.
* editing/IndentOutdentCommand.cpp:
(WebCore::IndentOutdentCommand::outdentParagraph):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (282509 => 282510)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-09-16 08:40:37 UTC (rev 282509)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-09-16 08:40:44 UTC (rev 282510)
@@ -1,3 +1,16 @@
+2021-04-23 Ian Gilbert <[email protected]>
+
+ Crash in IndentOutdentCommand::outdentParagraph attempting to move a paragraph
+ https://bugs.webkit.org/show_bug.cgi?id=224909
+
+ Reviewed by Ryosuke Niwa.
+
+ Added check inside IndentOutdentCommand::outdentParagraph to ensure that inserting a
+ HTMLBRElement was successful before attempting to move a paragraph to that node.
+
+ * editing/IndentOutdentCommand.cpp:
+ (WebCore::IndentOutdentCommand::outdentParagraph):
+
2021-04-19 Darin Adler <[email protected]>
Nullptr crash in CSSCalcValue::category() via HTMLConverterCaches::floatPropertyValueForNode
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/IndentOutdentCommand.cpp (282509 => 282510)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/IndentOutdentCommand.cpp 2021-09-16 08:40:37 UTC (rev 282509)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/IndentOutdentCommand.cpp 2021-09-16 08:40:44 UTC (rev 282510)
@@ -191,9 +191,9 @@
splitElement(*enclosingNode, highestInlineNode ? *highestInlineNode : *visibleStartOfParagraph.deepEquivalent().deprecatedNode());
}
auto placeholder = HTMLBRElement::create(document());
- auto* placeholderPtr = placeholder.ptr();
- insertNodeBefore(WTFMove(placeholder), *splitBlockquoteNode);
- moveParagraph(startOfParagraph(visibleStartOfParagraph), endOfParagraph(visibleEndOfParagraph), positionBeforeNode(placeholderPtr), true);
+ insertNodeBefore(placeholder, *splitBlockquoteNode);
+ if (placeholder->isConnected())
+ moveParagraph(startOfParagraph(visibleStartOfParagraph), endOfParagraph(visibleEndOfParagraph), positionBeforeNode(placeholder.ptr()), true);
}
// FIXME: We should merge this function with ApplyBlockElementCommand::formatSelection
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
