diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-02-23 11:07:10 (GMT) |
|---|---|---|
| committer | Markus Goetz <Markus.Goetz@nokia.com> | 2011-02-24 12:36:03 (GMT) |
| commit | bc320e1f1e0157d53d153b2392a36905e012b683 (patch) | |
| tree | 5198c3a9c8acbdb6052c46c4a2329f5cc225f459 | |
| parent | ea7ede44c7ca6e4f87c9817ffd23ebb6a6f6260d (diff) | |
| download | Qt-bc320e1f1e0157d53d153b2392a36905e012b683.zip Qt-bc320e1f1e0157d53d153b2392a36905e012b683.tar.gz Qt-bc320e1f1e0157d53d153b2392a36905e012b683.tar.bz2 | |
Check engine existence before increasing reference count
Reviewed-by: TrustMe
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index d2e8291..a63fdbf 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1836,9 +1836,11 @@ QFontEngine *QTextEngine::fontEngine(const QScriptItem &si, QFixed *ascent, QFix scaledEngine = font.d->engineForScript(script); } feCache.prevFontEngine = engine; - engine->ref.ref(); + if (engine) + engine->ref.ref(); feCache.prevScaledFontEngine = scaledEngine; - scaledEngine->ref.ref(); + if (scaledEngine) + scaledEngine->ref.ref(); feCache.prevScript = script; feCache.prevPosition = si.position; feCache.prevLength = length(&si); @@ -1849,7 +1851,8 @@ QFontEngine *QTextEngine::fontEngine(const QScriptItem &si, QFixed *ascent, QFix else { engine = font.d->engineForScript(script); feCache.prevFontEngine = engine; - engine->ref.ref(); + if (engine) + engine->ref.ref(); feCache.prevScript = script; feCache.prevPosition = -1; feCache.prevLength = -1; |