From 0277f14f48539d5f9d443c7d4135a54d4a5e2a62 Mon Sep 17 00:00:00 2001
From: Yuchen Deng <loaden@gmail.com>
Date: Sat, 31 Dec 2011 19:26:45 +0800
Subject: Avoiding crash when insert preEditString

We will insert an preEditString by QInputMethodEvent
See:
Task-number: QTCREATORBUG-5633
Task-number: QTCREATORBUG-6082

Change-Id: I8cfc7ab2543455dfdff8ec3df983d384513453e0
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/gui/text/qtextcursor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/gui')

diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 10bbff3671..6bbf1be0e3 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -495,6 +495,8 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor
             break;
         }
         newPosition = blockIt.position() + line.textStart() + line.textLength();
+        if (newPosition >= priv->length())
+            newPosition = priv->length() - 1;
         if (line.lineNumber() < layout->lineCount() - 1) {
             const QString text = blockIt.text();
             // ###### this relies on spaces being the cause for linebreaks.
-- 
cgit v1.2.3