[Emacs-diffs] trunk r113797: Fix memory leak warning.

[Jan D.]

------------------------------------------------------------
revno: 113797
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-11 17:05:13 +0200
message:
  Fix memory leak warning.
  
  * nsfns.m (Fns_convert_utf8_nfd_to_nfc): Allocate and release pool to
  remove memory leak warnings.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-11 14:57:12 +0000
+++ b/src/ChangeLog     2013-08-11 15:05:13 +0000
@@ -1,5 +1,8 @@
 2013-08-11  Jan Djärv  <address@hidden>
 
+       * nsfns.m (Fns_convert_utf8_nfd_to_nfc): Allocate and release pool to
+       remove memory leak warnings.
+
        * nsterm.m (menu_pending_title, ns_get_pending_menu_title): Remove.
        (ns_check_menu_open): Handle menu == nil.  Remove assignment to
        menu_pending_title.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-08-11 01:30:20 +0000
+++ b/src/nsfns.m       2013-08-11 15:05:13 +0000
@@ -2035,13 +2035,17 @@
 /* TODO: If GNUstep ever implements precomposedStringWithCanonicalMapping,
          remove this. */
   NSString *utfStr;
+  Lisp_Object ret;
 
   CHECK_STRING (str);
-  utfStr = [NSString stringWithUTF8String: SSDATA (str)];
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ utfStr = [NSString stringWithUTF8String: SSDATA (str)];
 #ifdef NS_IMPL_COCOA
-    utfStr = [utfStr precomposedStringWithCanonicalMapping];
+  utfStr = [utfStr precomposedStringWithCanonicalMapping];
 #endif
-  return build_string ([utfStr UTF8String]);
+  ret = build_string ([utfStr UTF8String]);
+  [pool release];
+  return ret;
 }