From 1cbebafe89610329a252b4cc076cd2dccf6e56aa Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 23 Jan 2018 19:47:57 -0800 Subject: [PATCH] font: Check return value from _cairo_ft_unscaled_font_lock_face MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cairo-ft-font.c: In function ‘_cairo_ft_has_color_glyphs’: cairo-ft-font.c:3011:9: warning: ignoring return value of ‘_cairo_ft_unscaled_font_lock_face’, declared with attribute warn_unused_result [-Wunused-result] _cairo_ft_unscaled_font_lock_face (unscaled); ^ --- src/cairo-ft-font.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 1f726bc2a..3c911cf39 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -3008,8 +3008,11 @@ _cairo_ft_has_color_glyphs (void *scaled) cairo_ft_unscaled_font_t *unscaled = ((cairo_ft_scaled_font_t *)scaled)->unscaled; if (!unscaled->have_color_set) { - _cairo_ft_unscaled_font_lock_face (unscaled); - _cairo_ft_unscaled_font_unlock_face (unscaled); + FT_Face face; + face = _cairo_ft_unscaled_font_lock_face (unscaled); + if (unlikely (face == NULL)) + return FALSE; + _cairo_ft_unscaled_font_unlock_face (unscaled); } return unscaled->have_color;