From d6b3e191d1fe6098d6d3018c18dd6406b556901a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 12 Feb 2018 22:13:37 -0800 Subject: [PATCH] Fix crash while searching when group somehow has nil members This shouldn't normally happen, but seeing it on my device. // FREEBIE --- SignalServiceKit/src/Messages/TSGroupModel.m | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/SignalServiceKit/src/Messages/TSGroupModel.m b/SignalServiceKit/src/Messages/TSGroupModel.m index a07e2ee5a..187b63c63 100644 --- a/SignalServiceKit/src/Messages/TSGroupModel.m +++ b/SignalServiceKit/src/Messages/TSGroupModel.m @@ -23,6 +23,22 @@ NS_ASSUME_NONNULL_BEGIN return self; } +- (nullable instancetype)initWithCoder:(NSCoder *)coder +{ + self = [super initWithCoder:coder]; + if (!self) { + return self; + } + + // Occasionally seeing this as nil in legacy data, + // which causes crashes. + if (_groupMemberIds == nil) { + _groupMemberIds = [NSArray new]; + } + + return self; +} + - (BOOL)isEqual:(id)other { if (other == self) { return YES;