From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 2 Dec 2014 13:30:47 +0000 (+0100)
Subject: Fixes: debbugs:9133
X-Git-Tag: emacs-25.0.90~2635^2~224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a92789b1fccf7ae9a39ec1cc9316a18e01d905bb;p=emacs.git

Fixes: debbugs:9133

* nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep
to nil after release.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c977eb490f5..5c3376562d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep
+	to nil after release (Bug#9133).
+
 2014-11-30  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port better to AddressSanitizer.
diff --git a/src/nsimage.m b/src/nsimage.m
index 580d8f327c2..7b67da015af 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -247,6 +247,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
               if (s >= bits + length)
                 {
                   [bmRep release];
+                  bmRep = nil;
                   return nil;
                 }
 #define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10)