# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1216487628 0
# Node ID ece3c792fb2e0cf82626f7ad5a3e514e21705eca
# Parent  eb46d321649488e7fe1142a0fb62ccca52b7dbc3
nsfont.m: duplicate UTF8Strings before modifying with nsfont_escape_family_name - patch due to Seiji Zenitani

diff -r eb46d3216494 -r ece3c792fb2e src/ChangeLog
--- a/src/ChangeLog	Sat Jul 19 17:01:36 2008 +0000
+++ b/src/ChangeLog	Sat Jul 19 17:13:48 2008 +0000
@@ -1,3 +1,9 @@
+2008-07-19  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* nsfont.m (nsfont_fmember_to_entity, nsfont_make_fontset_for_font):
+	strdup() the family UTF8String before modifying it.  Patch due to
+	Seiji Zenitani.
+
 2008-07-19  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* nsfns.m (ns_set_background_color): Apply patch from Chong Yidong to
diff -r eb46d3216494 -r ece3c792fb2e src/nsfont.m
--- a/src/nsfont.m	Sat Jul 19 17:01:36 2008 +0000
+++ b/src/nsfont.m	Sat Jul 19 17:13:48 2008 +0000
@@ -150,7 +150,7 @@
   unsigned int traits = [[famMember objectAtIndex: 3] unsignedIntValue];
 /*   NSString *psName = [famMember objectAtIndex: 0]; */
   NSMutableString *suffix = [[famMember objectAtIndex: 1] mutableCopy];
-  char *escapedFamily = [family UTF8String];
+  char *escapedFamily = strdup ([family UTF8String]);
 
   nsfont_escape_name (escapedFamily);
   [suffix replaceOccurrencesOfString: @" " withString: @"" options: 0
@@ -181,6 +181,7 @@
      }
 
   [suffix release];
+  free (escapedFamily);
   return font_entity;
 }
 
@@ -1226,7 +1227,7 @@
 
         if (cfont != nil)
           {
-            char *family = [[cfont familyName] UTF8String];
+            char *family = strdup([[cfont familyName] UTF8String]);
             Lisp_Object famAndReg;
 
             nsfont_escape_name (family);
@@ -1238,6 +1239,7 @@
                        SDATA (SYMBOL_NAME (scripts[i])));
 
             Fset_fontset_font (name, scripts[i], famAndReg, Qnil, Qnil);
+            free (family);
           }
         else
           {