From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Fri, 13 Jul 2012 12:17:26 +0000 (+0200)
Subject: Avoid crash when getting bearings from fallback font engine
X-Git-Tag: v5.0.0-beta1~793
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28826fe4631ae06b49bf718c807accab6a6eb89b;p=profile%2Fivi%2Fqtbase.git

Avoid crash when getting bearings from fallback font engine

When accessing a fallback engine, we always need to call
ensureEngineAt() to make sure it's loaded.

Change-Id: Ib27e34137cfe8a3dd2b358aef3b3296a4ca52478
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
---

diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index e757102..1ae50c7 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1489,6 +1489,7 @@ glyph_metrics_t QFontEngineMulti::boundingBox(const QGlyphLayout &glyphs)
 void QFontEngineMulti::getGlyphBearings(glyph_t glyph, qreal *leftBearing, qreal *rightBearing)
 {
     int which = highByte(glyph);
+    ensureEngineAt(which);
     engine(which)->getGlyphBearings(stripped(glyph), leftBearing, rightBearing);
 }