andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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).

Browse source
This commit is contained in:
Ben Key 2011-04-15 22:14:08 -05:00
parent 4a1a6b5b7d
commit 613052cdfe
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ChangeLog
View file

@ -1,3 +1,13 @@
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.

4
src/nsfont.m
View file

@ -104,7 +104,7 @@ ns_get_family (Lisp_Object font_spec)
NSString *family;
ns_unescape_name (tmp);
family = [NSString stringWithUTF8String: tmp];
free (tmp);
xfree (tmp);
return family;
}
}
@ -217,7 +217,7 @@ ns_descriptor_to_entity (NSFontDescriptor *desc,
debug_print (font_entity);
}
free (escapedFamily);
xfree (escapedFamily);
return font_entity;
}