3 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 34307c38956..db7f5ce58b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-02  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (w32_load_system_font): Clear all members of FONTP before
+        filling them.
+
+        * w32bdf.c (w32_load_bdf_font): Likewise.
+
 2003-09-30  Richard M. Stallman  <rms@gnu.org>
 
         * term.c (set_tty_color_mode): Calculate current_mode_spec
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 8f7718807a3..567030a23e8 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -768,6 +768,7 @@ struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
 
   /* Now fill in the slots of *FONTP.  */
   BLOCK_INPUT;
+  bzero (fontp, sizeof (*fontp));
   fontp->font = font;
   fontp->font_idx = dpyinfo->n_fonts;
   fontp->name = (char *) xmalloc (strlen (fontname) + 1);
diff --git a/src/w32fns.c b/src/w32fns.c
index 53d3418c3e7..9a45741c35b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4784,6 +4784,7 @@ w32_load_system_font (f,fontname,size)
 
     /* Now fill in the slots of *FONTP.  */
     BLOCK_INPUT;
+    bzero (fontp, sizeof (*fontp));
     fontp->font = font;
     fontp->font_idx = i;
     fontp->name = (char *) xmalloc (strlen (fontname) + 1);