commit ee76f4fbcb44ea094b7c43efa37df9c4bdf8433f
author eric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 25 22:14:46 2009 +0000
committer eric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 25 22:14:46 2009 +0000
tree f4b37f919fad6ac8ee4623f5477cefe0955feb9d
parent c26e60c31b66e3f3f9be4103d35d6af35d0849f7

        Reviewed by Darin Adler.

        Fix case where lBreak.obj->isBR() when lBreak.obj was NULL
        https://bugs.webkit.org/show_bug.cgi?id=24684

        I don't have a test case where we were taking the wrong path here
        However, adding an ASSERT(lBreak.obj) before this usage caused
        multiple bidi tests to fail, so lBreak.obj can be null here.

        * rendering/bidi.cpp:
        (WebCore::RenderBlock::findNextLineBreak):
          lBreak.obj can be null, so we can't call ->isBR() on it unconditionally.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@41988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/bidi.cpp

diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 4a6a42b..3765d13 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -2098,8 +2098,7 @@
     }
 
  end:
-
-    if (lBreak == resolver.position() && !lBreak.obj->isBR()) {
+    if (lBreak == resolver.position() && (!lBreak.obj || !lBreak.obj->isBR())) {
         // we just add as much as possible
         if (style()->whiteSpace() == PRE) {
             // FIXME: Don't really understand this case.