From fbcc6a346b81a04f8a5f1a8a05aa973a58a64fc7 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Wed, 9 Dec 2020 17:16:03 +0100 Subject: [PATCH] Avoid overflowing QFixed in text layout Fixes: QTBUG-89172 Change-Id: Icb78c8eeb1dbe4c5d4c6476beebafc0115a91e8c Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 36ccbee34e89d185918a2925444dac11211e5c60) Reviewed-by: Qt Cherry-pick Bot --- src/gui/text/qtextlayout.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 6c18c53bca6..d303219bb9c 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();