From 34e5d022422590a0e100491804f5c2acdcab9071 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 3 Mar 2005 19:51:31 +0000 Subject: Add bug # to ChangeLog --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ pango/pango-fontmap.c | 1 + 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2b2b22be..80a13d24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-03-03 Owen Taylor + + * pango/pango-fontmap.c (pango_font_map_load_font): Add + a g_return_if_fail() if desc doesn't have a family. + (#165866, Kees Cook) + 2005-03-03 Owen Taylor * pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 2b2b22be..80a13d24 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2005-03-03 Owen Taylor + + * pango/pango-fontmap.c (pango_font_map_load_font): Add + a g_return_if_fail() if desc doesn't have a family. + (#165866, Kees Cook) + 2005-03-03 Owen Taylor * pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs): diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c index c94e1a24..80fcfbd3 100644 --- a/pango/pango-fontmap.c +++ b/pango/pango-fontmap.c @@ -58,6 +58,7 @@ pango_font_map_load_font (PangoFontMap *fontmap, const PangoFontDescription *desc) { g_return_val_if_fail (fontmap != NULL, NULL); + g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL); return PANGO_FONT_MAP_GET_CLASS (fontmap)->load_font (fontmap, context, desc); } -- cgit v1.2.1