Changeset 52607 in webkit

Timestamp:

Dec 28, 2009 10:25:16 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-28 Mike Moretti <​webkit9@mordent.com>

Reviewed by Darin Adler.

Fix bug 28245 - problem with inserting a span into a long text block causing a crash because of a null string

Test: fast/dom/insert-span-into-long-text-bug-28245.html

• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::findNextLineBreak):

2009-12-28 Mike Moretti <​webkit9@mordent.com>

Reviewed by Darin Adler.

Fix bug 28245 - problem with inserting a span into a long text block causing a crash because of a null string

• fast/dom/insert-span-into-long-text-bug-28245-expected.txt: Added.
• fast/dom/insert-span-into-long-text-bug-28245.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/insert-span-into-long-text-bug-28245-expected.txt (added)
• LayoutTests/fast/dom/insert-span-into-long-text-bug-28245.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-28  Mike Moretti  <webkit9@mordent.com>
+
+        Reviewed by Darin Adler.
+
+        Fix bug 28245 - problem with inserting a span into a long text block causing a crash because of a null string
+
+        * fast/dom/insert-span-into-long-text-bug-28245-expected.txt: Added.
+        * fast/dom/insert-span-into-long-text-bug-28245.html: Added.
+
 2009-12-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-28  Mike Moretti  <webkit9@mordent.com>
+
+        Reviewed by Darin Adler.
+
+        Fix bug 28245 - problem with inserting a span into a long text block causing a crash because of a null string
+
+        Test: fast/dom/insert-span-into-long-text-bug-28245.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::findNextLineBreak):
+
 2009-12-28  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1928 +1928 @@
                         }
                         if (lineWasTooWide || w + tmpW > width) {
-                            if (lBreak.obj && shouldPreserveNewline(lBreak.obj) && lBreak.obj->isText() && !toRenderText(lBreak.obj)->isWordBreak() && toRenderText(lBreak.obj)->characters()[lBreak.pos] == '\n') {
+                            if (lBreak.obj && shouldPreserveNewline(lBreak.obj) && lBreak.obj->isText() && toRenderText(lBreak.obj)->textLength() && !toRenderText(lBreak.obj)->isWordBreak() && toRenderText(lBreak.obj)->characters()[lBreak.pos] == '\n') {
                                 if (!stoppedIgnoringSpaces && pos > 0) {
                                     // We need to stop right before the newline and then start up again.