From bfc09b8d8fa6c1a397aff458c644ed424754adf0 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Tue, 26 Jan 2021 17:29:08 +0100
Subject: Avoid overflow in text layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes oss-fuzz issue 29313.

Pick-to: 6.0 5.15
Change-Id: Idbabd162fa9e0dbce687981bdbcc75be37189a61
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
---
 tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'tests/auto/gui/text')

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()
-- 
cgit v1.2.3