From d84cf78df8ea5d99cc5b38c49f3b7aed081170f5 Mon Sep 17 00:00:00 2001 From: Alan Third Date: Sat, 2 Jan 2021 18:19:39 +0000 Subject: [PATCH] Fix NS toolbar image release crash (bug#43973) The toolbar fails to make a proper copy of EmacsImage objects, so releasing the copy incorrectly released instance variables from the original objects. * src/nsimage.m ([EmacsImage copyWithZone:]): New function to enable correct copying of EmacsImage. --- src/nsimage.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/nsimage.m b/src/nsimage.m index f0014b50b9b..fa81a41a519 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -293,6 +293,18 @@ ns_image_size_in_bytes (void *img) } +- (id)copyWithZone:(NSZone *)zone +{ + EmacsImage *copy = [super copyWithZone:zone]; + + copy->stippleMask = [stippleMask copyWithZone:zone]; + copy->bmRep = [bmRep copyWithZone:zone]; + copy->transform = [transform copyWithZone:zone]; + + return copy; +} + + /* Create image from monochrome bitmap. If both FG and BG are 0 (black), set the background to white and make it transparent. */ - (instancetype)initFromXBM: (unsigned char *)bits width: (int)w height: (int)h -- 2.39.5