From 28826fe4631ae06b49bf718c807accab6a6eb89b Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 13 Jul 2012 14:17:26 +0200 Subject: [PATCH] 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 --- src/gui/text/qfontengine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index e757102db0..1ae50c75d8 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); }