From b110042886198dc51b82d1f9d4c957121ee336eb Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 10 Apr 2015 10:24:55 -0700 Subject: Fix warnings if font is not found --- pango/fonts.c | 3 ++- pango/pango-engine.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pango/fonts.c b/pango/fonts.c index 52ef72df..6b7d9495 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -1558,7 +1558,8 @@ pango_font_find_shaper (PangoFont *font, { PangoEngineShape* shaper; - g_return_val_if_fail (font != NULL, NULL); + if (G_UNLIKELY (!font)) + return NULL; shaper = PANGO_FONT_GET_CLASS (font)->find_shaper (font, language, ch); diff --git a/pango/pango-engine.c b/pango/pango-engine.c index 777132b7..f2797e48 100644 --- a/pango/pango-engine.c +++ b/pango/pango-engine.c @@ -153,8 +153,8 @@ _pango_engine_shape_covers (PangoEngineShape *engine, PangoLanguage *language, gunichar wc) { - g_return_val_if_fail (PANGO_IS_ENGINE_SHAPE (engine), PANGO_COVERAGE_NONE); - g_return_val_if_fail (PANGO_IS_FONT (font), PANGO_COVERAGE_NONE); + if (G_UNLIKELY (!engine || !font)) + return PANGO_COVERAGE_NONE; return PANGO_ENGINE_SHAPE_GET_CLASS (engine)->covers (engine, font, -- cgit v1.2.1