Changeset 95017 in webkit

Timestamp:

Sep 12, 2011 10:57:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Crashes in WebCore::InsertListCommand::unlistifyParagraph.
​https://bugs.webkit.org/show_bug.cgi?id=67918

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-09-12
Reviewed by Ryosuke Niwa.

Source/WebCore:

execCommand("InsertUnorderedList") was crashing if the parent node of the target is
a kind of list element and it is not contenteditable.
This patch checks the parent node is contenteditable.

Test: editing/execCommand/insert-list-in-noneditable-list-parent.html

• editing/htmlediting.cpp:

(WebCore::enclosingListChild): Checks the parent node is contenteditable.

LayoutTests:

Added tests.

• editing/execCommand/insert-list-in-noneditable-list-parent-expected.txt: Added.
• editing/execCommand/insert-list-in-noneditable-list-parent.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/insert-list-in-noneditable-list-parent-expected.txt (added)
• LayoutTests/editing/execCommand/insert-list-in-noneditable-list-parent.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/htmlediting.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-12  Shinya Kawanaka  <shinyak@google.com>
+
+        Crashes in WebCore::InsertListCommand::unlistifyParagraph.
+        https://bugs.webkit.org/show_bug.cgi?id=67918
+
+        Reviewed by Ryosuke Niwa.
+
+        Added tests.
+
+        * editing/execCommand/insert-list-in-noneditable-list-parent-expected.txt: Added.
+        * editing/execCommand/insert-list-in-noneditable-list-parent.html: Added.
+
 2011-09-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-12  Shinya Kawanaka  <shinyak@google.com>
+
+        Crashes in WebCore::InsertListCommand::unlistifyParagraph.
+        https://bugs.webkit.org/show_bug.cgi?id=67918
+
+        Reviewed by Ryosuke Niwa.
+
+        execCommand("InsertUnorderedList") was crashing if the parent node of the target is
+        a kind of list element and it is not contenteditable.
+        This patch checks the parent node is contenteditable.
+
+        Test: editing/execCommand/insert-list-in-noneditable-list-parent.html
+
+        * editing/htmlediting.cpp:
+        (WebCore::enclosingListChild): Checks the parent node is contenteditable.
+
 2011-09-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -667 +667 @@
     // FIXME: This function is inappropriately named if it starts with node instead of node->parentNode()
     for (Node* n = node; n && n->parentNode(); n = n->parentNode()) {
-        if (n->hasTagName(liTag) || isListElement(n->parentNode()))
+        if (n->hasTagName(liTag) || (isListElement(n->parentNode()) && n != root))
             return n;
         if (n == root || isTableCell(n))