From 1cfee04d5e8eb3f5d539aad9625f92ff4d294f9c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 26 Sep 2011 12:18:46 +0200 Subject: Fix possible crash in QFontEngineFT Avoid crash if set pointer is null. Task-number: QTBUG-21647 Reviewed-by: Jiang Jiang (cherry picked from commit e05734987594f0e54f58a2ab3037cdf4956e9036) Change-Id: I49fde194ef6be5485a43c5d09fc43170ab9d4d6b Reviewed-on: http://codereview.qt-project.org/5532 Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Qt Sanity Bot --- src/gui/text/qfontengine_ft.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 61daf16990..6c351c0614 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -814,7 +814,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, if (set && set->outline_drawing) load_flags = FT_LOAD_NO_BITMAP; - if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing) + if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || (set && set->outline_drawing)) load_flags |= FT_LOAD_NO_HINTING; else load_flags |= load_target; -- cgit v1.2.3