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 c977eb490f53781cb048997bbf453097bb1617b8..5c3376562d3f4a5323cc9ee7e66ca162673a0762 100644 (file)
--- 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 580d8f327c2980042177a9c8d9b86e6983c67a61..7b67da015af348df5c2aaea5ddcc396ad9b17171 100644 (file)
--- 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)