diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-06-08 16:49:53 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-22 07:52:01 +0000 |
| commit | 015a52a6090d4e6367e849152b999f2d96ab6cf9 (patch) | |
| tree | 4fad65fa8b4a104f39fa11b2727e529ce8cb8dd1 /src/gui | |
| parent | 16b8e21fddb74f705efb3a0802866017e06e1ee1 (diff) | |
| download | qtbase-015a52a6090d4e6367e849152b999f2d96ab6cf9.tar.gz | |
Avoid overflow in text layout
Fixes oss-fuzz issue 34597.
Fixes: QTBUG-94197
Change-Id: Icabcd5a87b809b6a5ae0f1a696ec3b5dd906886b
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit e473d96e65e7cf3190c6c16acace6359964d0bee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 2c08ed648b..b302a883e0 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1980,7 +1980,8 @@ void QTextLine::layout_helper(int maxGlyphs) if (lbh.currentPosition >= eng->layoutData->string.length() || isBreakableSpace - || attributes[lbh.currentPosition].lineBreak) { + || attributes[lbh.currentPosition].lineBreak + || lbh.tmpData.textWidth >= QFIXED_MAX) { sb_or_ws = true; break; } else if (attributes[lbh.currentPosition].graphemeBoundary) { |