From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 11 Aug 2013 15:05:13 +0000 (+0200)
Subject: Fix memory leak warning.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~326
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=423d3b3f9acf6b4d9f9a0b8a22a20809896117e4;p=emacs.git

Fix memory leak warning.

* nsfns.m (Fns_convert_utf8_nfd_to_nfc): Allocate and release pool to
remove memory leak warnings.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 58806f4e0b1..f8aea1dc83b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2013-08-11  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* 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.
diff --git a/src/nsfns.m b/src/nsfns.m
index 64db1b7fd0a..ba0dba8c7e7 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2035,13 +2035,17 @@ DEFUN ("ns-convert-utf8-nfd-to-nfc", Fns_convert_utf8_nfd_to_nfc,
 /* 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;
 }