1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in QTextLayout::cursorToX

Browse Source 
When 'cursorPos' is out of bounds ([0, lineEnd]), this method crashed.

Change-Id: Ia0540ab3afbffb5c598f7b8515263cce3b3928e4
Task-number: QTBUG-40753
Reviewed-by: Dominik Haumann <dhaumann@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Kevin Funk 2014-08-28 15:46:03 +02:00 committed by Kevin Funk
parent b9a7cedb6e
commit eb44767945
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qtextlayout.cpp
View File

@ -2583,7 +2583,7 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
} }
int lineEnd = line.from + line.length + line.trailingSpaces; int lineEnd = line.from + line.length + line.trailingSpaces;
int pos = *cursorPos; int pos = qBound(0, *cursorPos, lineEnd);
int itm; int itm;
const QCharAttributes *attributes = eng->attributes(); const QCharAttributes *attributes = eng->attributes();
if (!attributes) { if (!attributes) {

23
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
View File

@ -86,6 +86,7 @@ private slots:
void cursorToXForSetColumns(); void cursorToXForSetColumns();
void cursorToXForTrailingSpaces_data(); void cursorToXForTrailingSpaces_data();
void cursorToXForTrailingSpaces(); void cursorToXForTrailingSpaces();
void cursorToXInvalidInput();
void horizontalAlignment_data(); void horizontalAlignment_data();
void horizontalAlignment(); void horizontalAlignment();
void horizontalAlignmentMultiline_data(); void horizontalAlignmentMultiline_data();
@ -674,6 +675,28 @@ void tst_QTextLayout::cursorToXForTrailingSpaces()
QCOMPARE(line.cursorToX(6), cursorAt6); QCOMPARE(line.cursorToX(6), cursorAt6);
} }
void tst_QTextLayout::cursorToXInvalidInput()
{
QTextLayout layout("aaa", testFont);
layout.beginLayout();
QTextLine line = layout.createLine();
line.setLineWidth(5);
layout.endLayout();
int cursorPos;
cursorPos = 0;
layout.lineAt(0).cursorToX(&cursorPos);
QCOMPARE(cursorPos, 0);
cursorPos = -300;
layout.lineAt(0).cursorToX(&cursorPos);
QCOMPARE(cursorPos, 0);
cursorPos = 300;
layout.lineAt(0).cursorToX(&cursorPos);
QCOMPARE(cursorPos, 3);
}
void tst_QTextLayout::horizontalAlignment_data() void tst_QTextLayout::horizontalAlignment_data()
{ {
qreal width = TESTFONT_SIZE * 4; qreal width = TESTFONT_SIZE * 4;