diff options
| author | Jan Djärv | 2013-08-11 17:05:13 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-08-11 17:05:13 +0200 |
| commit | 423d3b3f9acf6b4d9f9a0b8a22a20809896117e4 (patch) | |
| tree | 6ced5dbd51f0ca8f77a91bc7909ff95d45c6b7cf /src | |
| parent | d2d699ac519599385b2865627db065c0fbfd38f3 (diff) | |
| download | emacs-423d3b3f9acf6b4d9f9a0b8a22a20809896117e4.tar.gz emacs-423d3b3f9acf6b4d9f9a0b8a22a20809896117e4.zip | |
Fix memory leak warning.
* nsfns.m (Fns_convert_utf8_nfd_to_nfc): Allocate and release pool to
remove memory leak warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/nsfns.m | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 58806f4e0b1..f8aea1dc83b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-08-11 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2013-08-11 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsfns.m (Fns_convert_utf8_nfd_to_nfc): Allocate and release pool to | ||
| 4 | remove memory leak warnings. | ||
| 5 | |||
| 3 | * nsterm.m (menu_pending_title, ns_get_pending_menu_title): Remove. | 6 | * nsterm.m (menu_pending_title, ns_get_pending_menu_title): Remove. |
| 4 | (ns_check_menu_open): Handle menu == nil. Remove assignment to | 7 | (ns_check_menu_open): Handle menu == nil. Remove assignment to |
| 5 | menu_pending_title. | 8 | 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, | |||
| 2035 | /* TODO: If GNUstep ever implements precomposedStringWithCanonicalMapping, | 2035 | /* TODO: If GNUstep ever implements precomposedStringWithCanonicalMapping, |
| 2036 | remove this. */ | 2036 | remove this. */ |
| 2037 | NSString *utfStr; | 2037 | NSString *utfStr; |
| 2038 | Lisp_Object ret; | ||
| 2038 | 2039 | ||
| 2039 | CHECK_STRING (str); | 2040 | CHECK_STRING (str); |
| 2040 | utfStr = [NSString stringWithUTF8String: SSDATA (str)]; | 2041 | NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
| 2042 | utfStr = [NSString stringWithUTF8String: SSDATA (str)]; | ||
| 2041 | #ifdef NS_IMPL_COCOA | 2043 | #ifdef NS_IMPL_COCOA |
| 2042 | utfStr = [utfStr precomposedStringWithCanonicalMapping]; | 2044 | utfStr = [utfStr precomposedStringWithCanonicalMapping]; |
| 2043 | #endif | 2045 | #endif |
| 2044 | return build_string ([utfStr UTF8String]); | 2046 | ret = build_string ([utfStr UTF8String]); |
| 2047 | [pool release]; | ||
| 2048 | return ret; | ||
| 2045 | } | 2049 | } |
| 2046 | 2050 | ||
| 2047 | 2051 | ||