Compare commits

...

1 Commits

Author SHA1 Message Date
Matthew Chen
a132571087 Avoid crashes when signed prekey lookup fails.
// FREEBIE
2017-02-14 15:03:20 -05:00

View File

@ -142,8 +142,18 @@ const int kPreKeyOfLastResortId = 0xFFFFFF;
return -1;
}
ECKeyPair *ourSignedPrekey = [self.signedPreKeyStore loadSignedPrekey:message.signedPrekeyId].keyPair;
ECKeyPair *ourSignedPrekey = nil;
@try {
ourSignedPrekey = [self.signedPreKeyStore loadSignedPrekey:message.signedPrekeyId].keyPair;
} @catch (NSException *exception) {
NSLog(@"%@ %s Couldn't find signed prekey for id: %d, %@",
self.tag,
__PRETTY_FUNCTION__,
message.signedPrekeyId,
exception);
return -1;
}
ECKeyPair *_Nullable ourOneTimePreKey;
if (message.prekeyID >= 0) {
ourOneTimePreKey = [self.prekeyStore loadPreKey:message.prekeyID].keyPair;
@ -176,4 +186,16 @@ const int kPreKeyOfLastResortId = 0xFFFFFF;
}
}
#pragma mark - Logging
+ (NSString *)tag
{
return [NSString stringWithFormat:@"[%@]", self.class];
}
- (NSString *)tag
{
return self.class.tag;
}
@end