diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-16 13:43:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-16 13:43:59 (GMT) |
| commit | ebcfb56d3631d4fa2b2259cf3a064d541ec533cd (patch) | |
| tree | 195f3f0326f3f2391ab1b1f4f84e2c419c9bad6c | |
| parent | 0e0a3883675ed2943af9810b8354ed406075a6ee (diff) | |
| parent | 9851e6da855357d6c1c17e956ba628aa975f92ce (diff) | |
| download | Qt-ebcfb56d3631d4fa2b2259cf3a064d541ec533cd.zip Qt-ebcfb56d3631d4fa2b2259cf3a064d541ec533cd.tar.gz Qt-ebcfb56d3631d4fa2b2259cf3a064d541ec533cd.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix crash in positionInLigature
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 2fc1dbd..71cb0e7 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2912,7 +2912,7 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end, closestItem--; int pos = si->position + clusterStart + closestItem; // Jump to the next charStop - while (!attrs[pos].charStop && pos < end) + while (pos < end && !attrs[pos].charStop) pos++; return pos; } |