[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_libs/textlayout=3A_Be_sure_we_don=27t_e?=
From:       Sebastian Sauer <sebastian.sauer () kdab ! com>
Date:       2011-06-16 0:59:54
Message-ID: 20110616005954.2E63DA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 352456de346acc195cd7d0e4dc9a18e642aca1b5 by Sebastian Sauer.
Committed on 16/06/2011 at 02:59.
Pushed by sebsauer into branch 'master'.

Be sure we don't end with a past-end iterator.

M  +2    -1    libs/textlayout/KoTextLayoutArea.cpp     

http://commits.kde.org/calligra/352456de346acc195cd7d0e4dc9a18e642aca1b5

diff --git a/libs/textlayout/KoTextLayoutArea.cpp b/libs/textlayout/KoTextLayoutArea.cpp
index 30dabe2..de0c39f 100644
--- a/libs/textlayout/KoTextLayoutArea.cpp
+++ b/libs/textlayout/KoTextLayoutArea.cpp
@@ -460,7 +460,8 @@ bool KoTextLayoutArea::layout(FrameIterator *cursor)
                 if (!nextIt.currentFrame())
                     cursor->it = nextIt;
                 m_endOfArea = new FrameIterator(cursor);
-                ++(cursor->it);
+                if (!cursor->it.atEnd())
+                    ++(cursor->it);
                 setBottom(m_y + m_footNotesHeight);
                 m_blockRects.last().setBottom(m_y);
                 return false;

[prev in list] [next in list] [prev in thread] [next in thread]