diff options
| author | Jason Rumney | 2003-10-02 23:07:28 +0000 |
|---|---|---|
| committer | Jason Rumney | 2003-10-02 23:07:28 +0000 |
| commit | 0d4c2dc2bbbb5ddce109803c8158e8c55c22ddf7 (patch) | |
| tree | 4c3e4d76723a9c2d82007289bab4f9a9714006b1 | |
| parent | 317e609b97458fce16ee03f191b9acce0b093964 (diff) | |
| download | emacs-0d4c2dc2bbbb5ddce109803c8158e8c55c22ddf7.tar.gz emacs-0d4c2dc2bbbb5ddce109803c8158e8c55c22ddf7.zip | |
* w32fns.c (w32_load_system_font): Clear all members of FONTP before
filling them.
* w32bdf.c (w32_load_bdf_font): Likewise.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/w32bdf.c | 1 | ||||
| -rw-r--r-- | src/w32fns.c | 1 |
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 @@ | |||
| 1 | 2003-10-02 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * w32fns.c (w32_load_system_font): Clear all members of FONTP before | ||
| 4 | filling them. | ||
| 5 | |||
| 6 | * w32bdf.c (w32_load_bdf_font): Likewise. | ||
| 7 | |||
| 1 | 2003-09-30 Richard M. Stallman <rms@gnu.org> | 8 | 2003-09-30 Richard M. Stallman <rms@gnu.org> |
| 2 | 9 | ||
| 3 | * term.c (set_tty_color_mode): Calculate current_mode_spec | 10 | * 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, | |||
| 768 | 768 | ||
| 769 | /* Now fill in the slots of *FONTP. */ | 769 | /* Now fill in the slots of *FONTP. */ |
| 770 | BLOCK_INPUT; | 770 | BLOCK_INPUT; |
| 771 | bzero (fontp, sizeof (*fontp)); | ||
| 771 | fontp->font = font; | 772 | fontp->font = font; |
| 772 | fontp->font_idx = dpyinfo->n_fonts; | 773 | fontp->font_idx = dpyinfo->n_fonts; |
| 773 | fontp->name = (char *) xmalloc (strlen (fontname) + 1); | 774 | 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) | |||
| 4784 | 4784 | ||
| 4785 | /* Now fill in the slots of *FONTP. */ | 4785 | /* Now fill in the slots of *FONTP. */ |
| 4786 | BLOCK_INPUT; | 4786 | BLOCK_INPUT; |
| 4787 | bzero (fontp, sizeof (*fontp)); | ||
| 4787 | fontp->font = font; | 4788 | fontp->font = font; |
| 4788 | fontp->font_idx = i; | 4789 | fontp->font_idx = i; |
| 4789 | fontp->name = (char *) xmalloc (strlen (fontname) + 1); | 4790 | fontp->name = (char *) xmalloc (strlen (fontname) + 1); |