[Emacs-diffs] /srv/bzr/emacs/trunk r112578: * nsfont.m (ns_spec_to_descriptor): Retain and autorelease fdesc.

[Jan Djärv]

------------------------------------------------------------
revno: 112578
fixes bug: http://debbugs.gnu.org/14375
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-14 11:34:16 +0200
message:
  * nsfont.m (ns_spec_to_descriptor): Retain and autorelease fdesc.
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-12 19:17:04 +0000
+++ b/src/ChangeLog     2013-05-14 09:34:16 +0000
@@ -1,3 +1,8 @@
+2013-05-14  Jan Djärv  <address@hidden>
+
+       * nsfont.m (ns_spec_to_descriptor): Retain and autorelease
+       fdesc (Bug#14375).
+
 2013-05-12  Paul Eggert  <address@hidden>
 
        * image.c (gif_load): Check that subimages fit (Bug#14345).

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2013-01-24 05:56:31 +0000
+++ b/src/nsfont.m      2013-05-14 09:34:16 +0000
@@ -151,10 +151,13 @@
     if ([tdict count] > 0)
        [fdAttrs setObject: tdict forKey: NSFontTraitsAttribute];
 
-    fdesc = [NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs];
+    fdesc = [[[NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs]
+               retain] autorelease];
+
     if (family != nil)
       {
-       fdesc = [fdesc fontDescriptorWithFamily: family];
+        NSFontDescriptor *fdesc2 = [fdesc fontDescriptorWithFamily: family];
+        fdesc = [[fdesc2 retain] autorelease];
       }
 
     [fdAttrs release];