From 5a02c2115c2522847ac3388e2719de6876166e03 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Wed, 4 Apr 2012 15:34:09 +1000 Subject: Fix crash with invalid pre-edit position. Ensure the script item position is within the bounds of the text block when adjusted to compensate for pre-edit text. Change-Id: I2c745bf08afc0d9bc3aba27c24c2a123af017dc6 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qtextengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 7d366275a3..e36104370c 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2185,7 +2185,7 @@ int QTextEngine::formatIndex(const QScriptItem *si) const int pos = si->position; if (specialData && si->position >= specialData->preeditPosition) { if (si->position < specialData->preeditPosition + specialData->preeditText.length()) - pos = qMax(specialData->preeditPosition - 1, 0); + pos = qMax(qMin(block.length(), specialData->preeditPosition) - 1, 0); else pos -= specialData->preeditText.length(); } -- cgit v1.2.3