Merge pull request #686 from Sequel-Ace/fix-deriveQueryString-crash

#fixed deriveQueryString crash
Sequel-Ace · Dec 23, 2020 · 5d70e94 · 5d70e94
2 parents 22926dc + 7f73b30
commit 5d70e94
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/Source/Controllers/MainViewControllers/TableContent/SPTableContent.m b/Source/Controllers/MainViewControllers/TableContent/SPTableContent.m
@@ -2529,9 +2529,20 @@ - (NSMutableString *)deriveQueryString{
 			}
 		}
 
+        NSDictionary *userInfo = @{
+            NSLocalizedDescriptionKey: @"deriveQueryString fieldValue is nil",
+            @"rowObject":[rowObject description],
+        };
+
+        if (fieldValue == nil || [fieldValue isNSNull]){
+            CLS_LOG(@"fieldValue is nil: %@", fieldValue);
+            SPLog(@"fieldValue is nil: %@", fieldValue);
+            [FIRCrashlytics.crashlytics recordError:[NSError errorWithDomain:@"database" code:6 userInfo:userInfo]];
+        }
+
 		// Store the key and value in the ordered arrays for saving.
-		[rowFieldsToSave addObject:[fieldDefinition objectForKey:@"name"]];
-		[rowValuesToSave addObject:fieldValue];
+		[rowFieldsToSave safeAddObject:[fieldDefinition safeObjectForKey:@"name"]];
+		[rowValuesToSave safeAddObject:fieldValue];
 	}
 
 	[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance];