AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTextEngine::shapeText(): Better error handling for corner cases

Browse Source 
Use Q_UNREACHABLE() instead of silly return to catch shaping errors,
which are fatal ones in fact, since the application would assert/crash
some later due to a hard dependency on the shaping result.

Change-Id: Ie58a2f2686a795f6178a588de6f2a2e37e1ed13c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-09-06 06:36:25 +03:00 committed by The Qt Project
parent 7b8f33fb78
commit 9ff76c27b9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -908,7 +908,7 @@ void QTextEngine::shapeText(int item) const
}
if (!ensureSpace(itemLength)) {
// ### report OOM error somehow
Q_UNREACHABLE(); // ### report OOM error somehow
return;
}
@ -934,12 +934,12 @@ void QTextEngine::shapeText(int item) const
if (!fontEngine->stringToCMap(reinterpret_cast<const QChar *>(string), itemLength, &initialGlyphs, &nGlyphs, shaperFlags)) {
nGlyphs = qMax(nGlyphs, itemLength); // ### needed for QFontEngine::stringToCMap() to not fail twice
if (!ensureSpace(nGlyphs)) {
// ### report OOM error somehow
Q_UNREACHABLE(); // ### report OOM error somehow
return;
}
initialGlyphs = availableGlyphs(&si);
if (!fontEngine->stringToCMap(reinterpret_cast<const QChar *>(string), itemLength, &initialGlyphs, &nGlyphs, shaperFlags)) {
// ### if this happens there is a bug in the fontengine
Q_UNREACHABLE(); // ### if this happens there is a bug in the fontengine
return;
}
}
@ -987,7 +987,7 @@ void QTextEngine::shapeText(int item) const
si.num_glyphs = shapeTextWithHarfbuzz(si, string, itemLength, fontEngine, itemBoundaries, kerningEnabled);
if (si.num_glyphs == 0) {
// ### report shaping errors somehow
Q_UNREACHABLE(); // ### report shaping errors somehow
return;
}