diff options
| author | Jan Djärv | 2014-12-02 14:30:47 +0100 |
|---|---|---|
| committer | Jan Djärv | 2014-12-02 14:30:47 +0100 |
| commit | a92789b1fccf7ae9a39ec1cc9316a18e01d905bb (patch) | |
| tree | d20e709ef28698f2f704172d962c09da2d1d0e7f | |
| parent | d4767877aca091ee1a04608e2b50b346745661d4 (diff) | |
| download | emacs-a92789b1fccf7ae9a39ec1cc9316a18e01d905bb.tar.gz emacs-a92789b1fccf7ae9a39ec1cc9316a18e01d905bb.zip | |
Fixes: debbugs:9133
* nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep
to nil after release.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsimage.m | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c977eb490f5..5c3376562d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-12-02 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep | ||
| 4 | to nil after release (Bug#9133). | ||
| 5 | |||
| 1 | 2014-11-30 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2014-11-30 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Port better to AddressSanitizer. | 8 | 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) | |||
| 247 | if (s >= bits + length) | 247 | if (s >= bits + length) |
| 248 | { | 248 | { |
| 249 | [bmRep release]; | 249 | [bmRep release]; |
| 250 | bmRep = nil; | ||
| 250 | return nil; | 251 | return nil; |
| 251 | } | 252 | } |
| 252 | #define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10) | 253 | #define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10) |