diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-20 22:27:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-20 22:27:49 (GMT) |
| commit | e22d40a6143709da6ee26c2f8e1b6a05904fd9b4 (patch) | |
| tree | aaaf6d7ebd7c8cdddcc4392551bf70f0040afe70 /src/gui | |
| parent | c0935e422d3be456c80fda287f291986da88db8f (diff) | |
| parent | ebcfb56d3631d4fa2b2259cf3a064d541ec533cd (diff) | |
| download | Qt-e22d40a6143709da6ee26c2f8e1b6a05904fd9b4.zip Qt-e22d40a6143709da6ee26c2f8e1b6a05904fd9b4.tar.gz Qt-e22d40a6143709da6ee26c2f8e1b6a05904fd9b4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix crash in positionInLigature
Diffstat (limited to 'src/gui')
| -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; } |