diff options
| author | Steven Tamm | 2004-12-20 16:46:17 +0000 |
|---|---|---|
| committer | Steven Tamm | 2004-12-20 16:46:17 +0000 |
| commit | 68c690279cf058547bb6898560fc0cab5b522bc1 (patch) | |
| tree | 85fcee5ee7f130a97502f801aebc500f59aef105 /src | |
| parent | 134579f2dadf89fca5d933fd7cb83fd7d3d32c4b (diff) | |
| download | emacs-68c690279cf058547bb6898560fc0cab5b522bc1.tar.gz emacs-68c690279cf058547bb6898560fc0cab5b522bc1.zip | |
(mac_do_list_fonts): Fix memory leak
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/macterm.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c7af7651f6c..33d6f42799c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-12-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * macterm.c (mac_do_list_fonts): Fix memory leak | ||
| 4 | |||
| 1 | 2004-12-20 Richard M. Stallman <rms@gnu.org> | 5 | 2004-12-20 Richard M. Stallman <rms@gnu.org> |
| 2 | 6 | ||
| 3 | * regex.c (re_match_2_internal) <symend, wordend>: | 7 | * regex.c (re_match_2_internal) <symend, wordend>: |
diff --git a/src/macterm.c b/src/macterm.c index ca15d3c4965..9dae0b54d70 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -6426,7 +6426,7 @@ mac_do_list_fonts (pattern, maxnames) | |||
| 6426 | { | 6426 | { |
| 6427 | font_list = Fcons (fontname, font_list); | 6427 | font_list = Fcons (fontname, font_list); |
| 6428 | if (exact || maxnames > 0 && ++n_fonts >= maxnames) | 6428 | if (exact || maxnames > 0 && ++n_fonts >= maxnames) |
| 6429 | return font_list; | 6429 | break; |
| 6430 | } | 6430 | } |
| 6431 | else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0 | 6431 | else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0 |
| 6432 | && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-"))) | 6432 | && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-"))) |
| @@ -6446,7 +6446,7 @@ mac_do_list_fonts (pattern, maxnames) | |||
| 6446 | { | 6446 | { |
| 6447 | font_list = Fcons (fontname, font_list); | 6447 | font_list = Fcons (fontname, font_list); |
| 6448 | if (exact || maxnames > 0 && ++n_fonts >= maxnames) | 6448 | if (exact || maxnames > 0 && ++n_fonts >= maxnames) |
| 6449 | return font_list; | 6449 | break; |
| 6450 | } | 6450 | } |
| 6451 | } | 6451 | } |
| 6452 | } | 6452 | } |