From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 2 Nov 2014 18:45:50 +0000 (+0100)
Subject: Fix memory leak
X-Git-Tag: emacs-25.0.90~2635^2~599
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=860ae4521f69729e5e94f567a95bd790872b888b;p=emacs.git

Fix memory leak

* nsimage.m (allocInitFromFile:): Initialize bmRep.
(dealloc): Release bmRep.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 07bb1e3fc85..2f719681afb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-02  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsimage.m (allocInitFromFile:): Initialize bmRep.
+	(dealloc): Release bmRep.
+
 	* nsterm.h (EmacsImage): Remove imageListNext, refCount, reference,
 	imageListSetNext, imageListNext.
 
diff --git a/src/nsimage.m b/src/nsimage.m
index 5bbf9fb49cd..580d8f327c2 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -174,6 +174,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
   image = [[EmacsImage alloc] initByReferencingFile:
                      [NSString stringWithUTF8String: SSDATA (found)]];
 
+  image->bmRep = nil;
 #ifdef NS_IMPL_COCOA
   imgRep = [NSBitmapImageRep imageRepWithData:[image TIFFRepresentation]];
 #else
@@ -199,6 +200,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
 - (void)dealloc
 {
   [stippleMask release];
+  [bmRep release];
   [super dealloc];
 }