Changeset 83026 in webkit

Timestamp:

Apr 6, 2011 12:22:26 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-06 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Ryosuke Niwa.

REGRESSION(r81328): Null pointer crash in canAppendNewLineFeed when selection isn't inside an editable element
​https://bugs.webkit.org/show_bug.cgi?id=57755

• editing/execCommand/insert-line-break-onload-expected.txt: Added.
• editing/execCommand/insert-line-break-onload.html: Added to check calling InsertLineBreak without any crash.

2011-04-06 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Ryosuke Niwa.

REGRESSION(r81328): Null pointer crash in canAppendNewLineFeed when selection isn't inside an editable element
​https://bugs.webkit.org/show_bug.cgi?id=57755

Test: editing/execCommand/insert-line-break-onload.html

• editing/TypingCommand.cpp: (WebCore::canAppendNewLineFeed): Added null pointer check for rootEditableElement().

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/insert-line-break-onload-expected.txt (added)
• LayoutTests/editing/execCommand/insert-line-break-onload.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/TypingCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-06  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        REGRESSION(r81328): Null pointer crash in canAppendNewLineFeed when selection isn't inside an editable element
+        https://bugs.webkit.org/show_bug.cgi?id=57755
+
+        * editing/execCommand/insert-line-break-onload-expected.txt: Added.
+        * editing/execCommand/insert-line-break-onload.html: Added to check calling InsertLineBreak without any crash.
+
 2011-04-05  James Kozianski  <koz@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        REGRESSION(r81328): Null pointer crash in canAppendNewLineFeed when selection isn't inside an editable element
+        https://bugs.webkit.org/show_bug.cgi?id=57755
+
+        Test: editing/execCommand/insert-line-break-onload.html
+
+        * editing/TypingCommand.cpp:
+        (WebCore::canAppendNewLineFeed): Added null pointer check for rootEditableElement().
+
 2011-04-05  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/editing/TypingCommand.cpp

@@ -50 +50 @@
 static bool canAppendNewLineFeed(const VisibleSelection& selection)
 {
+    Node* node = selection.rootEditableElement();
+    if (!node)
+        return false;
+
+    RefPtr<BeforeTextInsertedEvent> event = BeforeTextInsertedEvent::create(String("\n"));
     ExceptionCode ec = 0;
-    RefPtr<BeforeTextInsertedEvent> event = BeforeTextInsertedEvent::create(String("\n"));
-    selection.rootEditableElement()->dispatchEvent(event, ec);
+    node->dispatchEvent(event, ec);
     return event->text().length();
 }