summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2020-12-09 17:16:03 +0100
committerEirik Aavitsland <eirik.aavitsland@qt.io>2020-12-10 13:29:45 +0100
commit36ccbee34e89d185918a2925444dac11211e5c60 (patch)
tree799f7de5c9c2d4318e3417967b6758d2ed54dc1f /src/gui
parent2304acab5ff3bd3832c2e388cfdab27f2a95caa8 (diff)
Avoid overflowing QFixed in text layout
Pick-to: 6.0 5.15 5.12 Fixes: QTBUG-89172 Change-Id: Icb78c8eeb1dbe4c5d4c6476beebafc0115a91e8c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/qtextlayout.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 6c18c53bca..d303219bb9 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -2510,6 +2510,9 @@ void QTextLine::draw_internal(QPainter *p, const QPointF &pos,
return;
}
+ static QRectF maxFixedRect(QPointF(-QFIXED_MAX, -QFIXED_MAX), QPointF(QFIXED_MAX, QFIXED_MAX));
+ if (!maxFixedRect.contains(pos))
+ return;
QTextLineItemIterator iterator(eng, index, pos, selection);
QFixed lineBase = line.base();