From 0d31270aef0d0f38c3640c9fd41f0e74e79cd453 Mon Sep 17 00:00:00 2001 From: Jeffrey Lee Date: Fri, 11 Nov 2016 14:29:39 -0600 Subject: [PATCH 1/2] Remove abort() call to prevent crash on select clear --- Source/Models/FORMFieldValue.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Models/FORMFieldValue.m b/Source/Models/FORMFieldValue.m index 8844627e..80f5c7dc 100755 --- a/Source/Models/FORMFieldValue.m +++ b/Source/Models/FORMFieldValue.m @@ -42,8 +42,6 @@ - (BOOL)identifierIsEqualTo:(id)identifier { return [self.valueID isEqualToNumber:identifier]; } else if ([self.valueID isKindOfClass:[NSDate class]]) { return [self.valueID isEqualToDate:identifier]; - } else { - abort(); } return NO; From 8c5cc60dd4218199e83eae648f903257afe62515 Mon Sep 17 00:00:00 2001 From: Jeffrey Lee Date: Mon, 14 Nov 2016 13:16:00 -0600 Subject: [PATCH 2/2] Check for nil valueID instead of removing abort() --- Source/Models/FORMFieldValue.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Models/FORMFieldValue.m b/Source/Models/FORMFieldValue.m index 80f5c7dc..58529023 100755 --- a/Source/Models/FORMFieldValue.m +++ b/Source/Models/FORMFieldValue.m @@ -34,7 +34,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary { } - (BOOL)identifierIsEqualTo:(id)identifier { - if (!identifier) return NO; + if (!identifier || !self.valueID) return NO; if ([self.valueID isKindOfClass:[NSString class]]) { return [self.valueID isEqualToString:identifier]; @@ -42,6 +42,8 @@ - (BOOL)identifierIsEqualTo:(id)identifier { return [self.valueID isEqualToNumber:identifier]; } else if ([self.valueID isKindOfClass:[NSDate class]]) { return [self.valueID isEqualToDate:identifier]; + } else { + abort(); } return NO;