From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 22 Oct 2004 12:56:09 +0000 (+0000)
Subject: * xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
X-Git-Tag: ttn-vms-21-2-B4~4446
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63ea8ea52fbe8ffbbb06f5a1b5917c63eeaaf47f;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index efb792df4d6..d48516bd1c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xfns.c b/src/xfns.c
index 8d539472d11..2889975e175 100644
--- 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));