summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2021-01-26 17:29:08 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-11 06:18:32 +0000
commit69e0205bcb29adf5cf0a1c978f1f11514356a3fc (patch)
tree63b32f57cec724eb6776654389ab91c2d8e62523 /tests/auto/gui
parent3fec6597a5d718f5aa2ba5976b9175635a191ca0 (diff)
Avoid overflow in text layout
Fixes oss-fuzz issue 29313. Change-Id: Idbabd162fa9e0dbce687981bdbcc75be37189a61 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Robert Löhning <robert.loehning@qt.io> (cherry picked from commit bfc09b8d8fa6c1a397aff458c644ed424754adf0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index bbb53d85cc..9726db188a 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -1896,6 +1896,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()