diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | pango/pangocairo-font.c | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2007-06-14 Behdad Esfahbod <behdad@gnome.org> + + * pango/pangocairo-font.c + (_pango_cairo_font_private_scaled_font_data_destroy): + Check for NULL before dereferencing. Patch from Keith Packard. + 2007-06-13 Behdad Esfahbod <behdad@gnome.org> Bug 447189 – fonts.c: pango_font_face_is_synthesized returns NULL diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 9b449c0e..5349e687 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -75,8 +75,11 @@ _pango_cairo_font_private_scaled_font_data_create (void) static void _pango_cairo_font_private_scaled_font_data_destroy (PangoCairoFontPrivateScaledFontData *data) { - cairo_font_options_destroy (data->options); - g_slice_free (PangoCairoFontPrivateScaledFontData, data); + if (data) + { + cairo_font_options_destroy (data->options); + g_slice_free (PangoCairoFontPrivateScaledFontData, data); + } } cairo_scaled_font_t * |