[Emacs-diffs] /srv/bzr/emacs/trunk r103928: 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).

[Ben Key]

------------------------------------------------------------
revno: 103928
committer: Ben Key <address@hidden>
branch nick: trunk
timestamp: Fri 2011-04-15 22:14:08 -0500
message:
  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).
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-15 10:23:56 +0000
+++ b/src/ChangeLog     2011-04-16 03:14:08 +0000
@@ -1,3 +1,13 @@
+2011-04-16  Ben Key  <address@hidden>
+
+       * 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  <address@hidden>
 
        * sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2011-04-02 13:52:34 +0000
+++ b/src/nsfont.m      2011-04-16 03:14:08 +0000
@@ -104,7 +104,7 @@
       NSString *family;
       ns_unescape_name (tmp);
       family = [NSString stringWithUTF8String: tmp];
-      free (tmp);
+      xfree (tmp);
       return family;
     }
 }
@@ -217,7 +217,7 @@
        debug_print (font_entity);
       }
 
-    free (escapedFamily);
+    xfree (escapedFamily);
     return font_entity;
 }