From ab0ac1b8a84b0d259602f0029a3b5552466f35a6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 29 Jan 2009 09:45:11 +0000 Subject: [PATCH] [truetype] Initialise font_name Ensure the font_name is initialized to NULL. --- src/cairo-cff-subset.c | 2 ++ src/cairo-truetype-subset.c | 1 + 2 files changed, 3 insertions(+) diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c index baa210ed7..4697a1850 100644 --- a/src/cairo-cff-subset.c +++ b/src/cairo-cff-subset.c @@ -1773,6 +1773,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t *scaled_font_subset, font->ascent = (int16_t) be16_to_cpu (hhea.ascender); font->descent = (int16_t) be16_to_cpu (hhea.descender); + font->font_name = NULL; status = _cairo_truetype_read_font_name (scaled_font_subset->scaled_font, &font->ps_name, &font->font_name); @@ -2202,6 +2203,7 @@ _cairo_cff_fallback_init (cairo_cff_subset_t *cff_subset, if (unlikely (status)) goto fail2; + cff_subset->font_name = NULL; cff_subset->ps_name = strdup (font->ps_name); if (unlikely (cff_subset->ps_name == NULL)) { status = _cairo_error (CAIRO_STATUS_NO_MEMORY); diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c index a8c495f18..2633e87fb 100644 --- a/src/cairo-truetype-subset.c +++ b/src/cairo-truetype-subset.c @@ -201,6 +201,7 @@ _cairo_truetype_font_create (cairo_scaled_font_subset_t *scaled_font_subset, if (font->base.units_per_em == 0) font->base.units_per_em = 2048; + font->base.font_name = NULL; status = _cairo_truetype_read_font_name (scaled_font_subset->scaled_font, &font->base.ps_name, &font->base.font_name);