diff options
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index d303219bb9..b2b87fb92e 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -820,6 +820,10 @@ QTextLine QTextLayout::createLine() int l = d->lines.size(); if (l && d->lines.at(l-1).length < 0) { QTextLine(l-1, d).setNumColumns(INT_MAX); + if (d->maxWidth > QFIXED_MAX / 2) { + qWarning("QTextLayout: text too long, truncated."); + return QTextLine(); + } } int from = l > 0 ? d->lines.at(l-1).from + d->lines.at(l-1).length + d->lines.at(l-1).trailingSpaces : 0; int strlen = d->layoutData->string.length(); diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index ebbc21836b..0e5216f3c9 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -1895,6 +1895,19 @@ void tst_QTextLayout::longText() QVERIFY(line.isValid()); QVERIFY(line.cursorToX(line.textLength() - 1) > 0); } + + { + QTextLayout layout(QString("Qt rocks! ").repeated(200000)); + layout.setCacheEnabled(true); + layout.beginLayout(); + forever { + QTextLine line = layout.createLine(); + if (!line.isValid()) + break; + } + layout.endLayout(); + QVERIFY(layout.maximumWidth() <= QFIXED_MAX); + } } void tst_QTextLayout::widthOfTabs() |