--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -812,18 +812,23 @@ nsBidiPresUtils::TraverseFrames(nsBlockF
               while (end < endLine && nextSibling) { 
                 AdvanceAndAppendFrame(&frame, aLineIter, &nextSibling);
                 NS_ASSERTION(frame, "Premature end of continuation chain");
                 frame->GetOffsets(start, end);
                 mBuffer.Append(Substring(text, start,
                                          NS_MIN(end, endLine) - start));
               }
 
+              if (end < endLine) {
+                mPrevContent = nsnull;
+                break;
+              }
+
               PRBool createdContinuation = PR_FALSE;
-              if (end >= endLine && PRUint32(endLine) < text.Length()) {
+              if (PRUint32(endLine) < text.Length()) {
                 /*
                  * Timing is everything here: if the frame already has a bidi
                  * continuation, we need to make the continuation fluid *before*
                  * resetting the length of the current frame. Otherwise
                  * nsTextFrame::SetLength won't set the continuation frame's
                  * text offsets correctly.
                  *
                  * On the other hand, if the frame doesn't have a continuation,