# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1098449769 0
# Node ID 3b8eabf02badfb6f510bddc3caa5ad6178136656
# Parent  1cffc97af4c688d965bd6d5591f6287aee8080e0
* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.

diff -r 1cffc97af4c6 -r 3b8eabf02bad src/ChangeLog
--- a/src/ChangeLog	Fri Oct 22 11:20:12 2004 +0000
+++ b/src/ChangeLog	Fri Oct 22 12:56:09 2004 +0000
@@ -1,3 +1,7 @@
+2004-10-22  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
+
 2004-10-21  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
         * xterm.h (x_output): New member `xic_base_fontname'.
diff -r 1cffc97af4c6 -r 3b8eabf02bad src/xfns.c
--- a/src/xfns.c	Fri Oct 22 11:20:12 2004 +0000
+++ b/src/xfns.c	Fri Oct 22 12:56:09 2004 +0000
@@ -1949,7 +1949,7 @@
      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 @@
     }
 
   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));