From: erg <devnull@localhost>
Date: Fri, 14 Jan 2011 21:49:23 +0000 (+0000)
Subject: Don't try to use the font variable in -v to report info if font==NULL
X-Git-Tag: LAST_LIBGRAPH~32^2~1102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6767347f73027acc18c5ebb2fa6f0c71afc99c8d;p=graphviz

Don't try to use the font variable in -v to report info if font==NULL
---

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index 2f8297dc4..d6c11e1fe 100644
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -75,6 +75,7 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
     PangoRectangle logical_rect;
     PangoLayoutIter* iter;
     cairo_font_options_t* options;
+    PangoFont *font;
 #ifdef ENABLE_PANGO_MARKUP
     PangoAttrList *attrs;
     GError *error = NULL;
@@ -111,11 +112,9 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
         /* all text layout is done at a scale of 96ppi */
         pango_font_description_set_size (desc, (gint)(fontsize * PANGO_SCALE));
 
-        if (fontpath) {  /* -v support */
-	    PangoFont *font;
+        if (fontpath && (font = pango_font_map_load_font(fontmap, context, desc))) {  /* -v support */
 	    const char *fontclass;
 
-            font = pango_font_map_load_font(fontmap, context, desc);
 	    fontclass = G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(font));
 
 	    buf[0] = '\0';