* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.

diff --git a/src/ChangeLog b/src/ChangeLog
index efb792df4d6aae4f9175fd980c89b8479708675b..d48516bd1c26dab2486d8dc535b4d4253825219a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-22  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
+
 2004-10-21  K\e,Aa\e(Broly L\e$,1 q\e(Brentey  <lorentey@elte.hu>
 
         * xterm.h (x_output): New member `xic_base_fontname'.

diff --git a/src/xfns.c b/src/xfns.c
index 8d539472d118ce9afa4f30a10c47915f6c686ea4..2889975e17533867e95d4264547b9e76642095bc 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1949,7 +1949,7 @@ xic_create_xfontset (f, base_fontname)
      char *base_fontname;
 {
   XFontSet xfs = NULL;
-  char **missing_list;
+  char **missing_list = NULL;
   int missing_count;
   char *def_string;
   Lisp_Object rest, frame;
@@ -1968,12 +1968,14 @@ xic_create_xfontset (f, base_fontname)
     }
 
   if (!xfs)
-    /* New fontset.  */
-    xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
-                          base_fontname, &missing_list,
-                          &missing_count, &def_string);
-  if (missing_list)
-    XFreeStringList (missing_list);
+    {
+      /* New fontset.  */
+      xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
+                            base_fontname, &missing_list,
+                            &missing_count, &def_string);
+      if (missing_list)
+        XFreeStringList (missing_list);
+    }
 
   if (FRAME_XIC_BASE_FONTNAME (f))
     xfree (FRAME_XIC_BASE_FONTNAME (f));