1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTextLayout: keep strong reference on font engine in a layout loop

Browse Source 
This is speculative fix for the crashes in QTextLine::layout_helper()
we're observing on users side.

The possible reason is in that fontEngine and previousGlyphFontEngine,
which are stored in LBH, became invalid during the layout cycle
(destroyed by trimming font cache?).

To prevent this we need to handle font engine's ref-counter
gracefully, so just wrap them into QExplicitlySharedDataPointer.

As a drive-by change, use in-class initialization for LBH members.

Task-number: QTBUG-117500
Pick-to: 6.5 6.2 5.15
Change-Id: I6987a2b5618bb4ba8762f2ef01b4ce0dd60cb232
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit d914c58c7ee07f0d7598cee3491b815bd8d8bc23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Vladimir Belyavsky 2024-04-15 18:47:05 +03:00 committed by Qt Cherry-pick Bot
parent 2955a25f01
commit 363878499c
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/text/qtextlayout.cpp
View File

@ -1668,23 +1668,18 @@ namespace {
struct LineBreakHelper
{
LineBreakHelper()
: glyphCount(0), maxGlyphs(0), currentPosition(0), fontEngine(nullptr), logClusters(nullptr),
manualWrap(false), whiteSpaceOrObject(true)
{
}
LineBreakHelper() = default;
QScriptLine tmpData;
QScriptLine spaceData;
QGlyphLayout glyphs;
int glyphCount;
int maxGlyphs;
int currentPosition;
glyph_t previousGlyph;
QFontEngine *previousGlyphFontEngine;
int glyphCount = 0;
int maxGlyphs = 0;
int currentPosition = 0;
glyph_t previousGlyph = 0;
QExplicitlySharedDataPointer<QFontEngine> previousGlyphFontEngine;
QFixed minw;
QFixed currentSoftHyphenWidth;
@ -1692,11 +1687,11 @@ namespace {
QFixed rightBearing;
QFixed minimumRightBearing;
QFontEngine *fontEngine;
const unsigned short *logClusters;
QExplicitlySharedDataPointer<QFontEngine> fontEngine;
const unsigned short *logClusters = nullptr;
bool manualWrap;
bool whiteSpaceOrObject;
bool manualWrap = false;
bool whiteSpaceOrObject = true;
bool checkFullOtherwiseExtend(QScriptLine &line);
@ -1740,13 +1735,13 @@ namespace {
{
if (currentPosition <= 0)
return;
calculateRightBearing(fontEngine, currentGlyph());
calculateRightBearing(fontEngine.data(), currentGlyph());
}
inline void calculateRightBearingForPreviousGlyph()
{
if (previousGlyph > 0)
calculateRightBearing(previousGlyphFontEngine, previousGlyph);
calculateRightBearing(previousGlyphFontEngine.data(), previousGlyph);
}
static const QFixed RightBearingNotCalculated;