Don't assume that just because a purported font name begins with "-"

it's an XLFD font name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5596 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/main.c b/gtk/main.c
index 76b7863ad70cfdd40fed4f47a70498b37794c21e..64debf3e59c8e10abd087e24a02a93a72dc4f31b 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.251 2002/05/27 22:00:37 guy Exp $
+ * $Id: main.c,v 1.252 2002/05/30 00:44:50 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2195,6 +2195,20 @@ boldify(const char *font_name)
        /* Is this an XLFD font?  If it begins with "-", yes, otherwise no. */
        if (font_name[0] == '-') {
                xlfd_tokens = g_strsplit(font_name, "-", XLFD_WEIGHT+1);
+
+               /*
+                * Make sure we *have* a weight (this might not be a valid
+                * XLFD font name).
+                */
+               for (i = 0; i < XLFD_WEIGHT+1; i++) {
+                       if (xlfd_tokens[i] == NULL) {
+                               /*
+                                * We don't, so treat this as a non-XLFD
+                                * font name.
+                                */
+                               goto not_xlfd;
+                       }
+               }
                for (i = 0; i < N_WEIGHTS; i++) {
                        if (strcmp(xlfd_tokens[XLFD_WEIGHT],
                            weight_map[i].light) == 0) {
@@ -2206,10 +2220,15 @@ boldify(const char *font_name)
                }
                bold_font_name = g_strjoinv("-", xlfd_tokens);
                g_strfreev(xlfd_tokens);
-       } else {
-               /* Append "bold" to the name of the font. */
-               bold_font_name = g_strconcat(font_name, "bold", NULL);
+               return bold_font_name;
        }
+
+not_xlfd:
+       /*
+        * This isn't an XLFD font name; just append "bold" to the name
+        * of the font.
+        */
+       bold_font_name = g_strconcat(font_name, "bold", NULL);
        return bold_font_name;
 }