whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash in QTextEngine when a paragraph only contains a tab 

This fixes a regression introduced by change
c3d2d83fcb.

Change-Id: Idf840804c68cd6b1751e122b45e9dd2775af56f5
Fixes: QTBUG-72900
Fixes: QTBUG-72754
Reviewed-by: David Faure <david.faure@kdab.com>
bb10
Lars Knoll 2019-01-08 13:48:47 +01:00 committed by Jani Heikkinen
parent afb08ac5da
commit a8db9b8663
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/text/qtextengine.cpp
View File

@ -1972,14 +1972,18 @@ void QTextEngine::shape(int item) const
}
// fix log clusters to point to the previous glyph, as the object doesn't have a glyph of it's own.
// This is required so that all entries in the array get initialized and are ordered correctly.
ushort *lc = logClusters(&li);
*lc = item ? lc[-1] : 0;
if (layoutData->logClustersPtr) {
ushort *lc = logClusters(&li);
*lc = (lc != layoutData->logClustersPtr) ? lc[-1] : 0;
}
} else if (li.analysis.flags == QScriptAnalysis::Tab) {
// set up at least the ascent/descent/leading of the script item for the tab
fontEngine(li, &li.ascent, &li.descent, &li.leading);
// see the comment above
ushort *lc = logClusters(&li);
*lc = item ? lc[-1] : 0;
if (layoutData->logClustersPtr) {
ushort *lc = logClusters(&li);
*lc = (lc != layoutData->logClustersPtr) ? lc[-1] : 0;
}
} else {
shapeText(item);
}