Commit 613052cd authored by Ben Key's avatar Ben Key
Browse files

Fixed bugs in ns_get_family and ns_descriptor_to_entity that were caused by...

Fixed bugs in ns_get_family and ns_descriptor_to_entity that were caused by using free to deallocate memory blocks that were allocated by xmalloc (via xstrdup).
parent 4a1a6b5b
2011-04-16 Ben Key <bkey76@gmail.com>
* nsfont.m: Fixed bugs in ns_get_family and
ns_descriptor_to_entity that were caused by using free to
deallocate memory blocks that were allocated by xmalloc (via
xstrdup). This caused Emacs to crash when compiled with
XMALLOC_OVERRUN_CHECK defined (when Emacs was configured with
--enable-checking=xmallocoverrun). xfree is now used to
deallocate these memory blocks.
2011-04-15 Paul Eggert <eggert@cs.ucla.edu>
* sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.
......
......@@ -104,7 +104,7 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
NSString *family;
ns_unescape_name (tmp);
family = [NSString stringWithUTF8String: tmp];
free (tmp);
xfree (tmp);
return family;
}
}
......@@ -217,7 +217,7 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
debug_print (font_entity);
}
free (escapedFamily);
xfree (escapedFamily);
return font_entity;
}
......
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