[Emacs-diffs] /srv/bzr/emacs/trunk r103804: do not dereference NULL upon failed strdup

[Jim Meyering]

------------------------------------------------------------
revno: 103804
committer: Jim Meyering <address@hidden>
branch nick: trunk
timestamp: Sat 2011-04-02 15:52:34 +0200
message:
  do not dereference NULL upon failed strdup
  
  * nsfont.m (ns_descriptor_to_entity): Use xstrdup, not strdup.
  (ns_get_family): Likewise.
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-02 13:11:16 +0000
+++ b/src/ChangeLog     2011-04-02 13:52:34 +0000
@@ -1,3 +1,9 @@
+2011-04-02  Jim Meyering  <address@hidden>
+
+       do not dereference NULL upon failed strdup
+       * nsfont.m (ns_descriptor_to_entity): Use xstrdup, not strdup.
+       (ns_get_family): Likewise.
+
 2011-04-02  Juanma Barranquero  <address@hidden>
 
        * eval.c (unwind_to_catch) [DEBUG_GCPRO]: Remove redundant assignment.

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2011-01-29 10:36:16 +0000
+++ b/src/nsfont.m      2011-04-02 13:52:34 +0000
@@ -100,7 +100,7 @@
       return nil;
   else
     {
-      char *tmp = strdup (SDATA (SYMBOL_NAME (tem)));
+      char *tmp = xstrdup (SDATA (SYMBOL_NAME (tem)));
       NSString *family;
       ns_unescape_name (tmp);
       family = [NSString stringWithUTF8String: tmp];
@@ -176,7 +176,7 @@
     if (family == nil)
       family = [[NSFont userFixedPitchFontOfSize: 0] familyName];
 
-    escapedFamily = strdup ([family UTF8String]);
+    escapedFamily = xstrdup ([family UTF8String]);
     ns_escape_name (escapedFamily);
 
     ASET (font_entity, FONT_TYPE_INDEX, Qns);
@@ -1526,4 +1526,3 @@
   DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script,
                doc: /* Internal use: maps font registry to unicode script. */);
 }
-