Commit b179a3a2 authored by Andrew Choi's avatar Andrew Choi
Browse files

* src/macterm.c (mac_font_pattern_match): Allocate three more bytes to

regex for '^', '$', and '\0'.

* src/macterm.c (x_list_fonts): Protect pattern and newlist from
garbage collection.
parent 5604ec34
2001-01-28 Andrew Choi <akochoi@i-cable.com>
* src/macterm.c (mac_font_pattern_match): Allocate three more
bytes to regex for '^', '$', and '\0'.
* src/macterm.c (x_list_fonts): Protect pattern and newlist from
garbage collection.
* src/macfns.c (QCconversion): Replaces QCalgorithm.
* src/macfns.c (image_ascent, lookup_image): Adapt to change of
......
......@@ -10197,7 +10197,7 @@ mac_font_pattern_match (fontname, pattern)
char * fontname;
char * pattern;
{
char *regex = (char *) alloca (strlen (pattern) * 2);
char *regex = (char *) alloca (strlen (pattern) * 2 + 3);
char *font_name_copy = (char *) alloca (strlen (fontname) + 1);
char *ptr;
......@@ -10424,12 +10424,15 @@ x_list_fonts (struct frame *f,
Lisp_Object newlist = Qnil;
int n_fonts = 0;
int i;
struct gcpro gcpro1, gcpro2;
if (font_name_table == NULL) /* Initialize when first used. */
init_font_name_table ();
ptnstr = XSTRING (pattern)->data;
GCPRO2 (pattern, newlist);
/* Scan and matching bitmap fonts. */
for (i = 0; i < font_name_count; i++)
{
......@@ -10445,6 +10448,8 @@ x_list_fonts (struct frame *f,
/* MAC_TODO: add code for matching outline fonts here */
UNGCPRO;
return newlist;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment