Fixed not catching exception when an item has a weird key or value

mCodex · Dec 7, 2018 · 9b9d1c3 · 9b9d1c3
1 parent 7455624
commit 9b9d1c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/ios/RNSensitiveInfo/RNSensitiveInfo.m b/ios/RNSensitiveInfo/RNSensitiveInfo.m
@@ -212,13 +212,16 @@ - (NSString *)messageForError:(NSError *)error
 
             for (NSDictionary* item in (__bridge id)result) {
                 NSMutableDictionary *finalItem = [[NSMutableDictionary alloc] init];
-
-                [finalItem setObject:(NSString*)[item objectForKey:(__bridge id)(kSecAttrService)] forKey:@"service"];
-                [finalItem setObject:(NSString*)[item objectForKey:(__bridge id)(kSecAttrAccount)] forKey:@"key"];
-                [finalItem setObject:[[NSString alloc] initWithData:[item objectForKey:(__bridge id)(kSecValueData)] encoding:NSUTF8StringEncoding] forKey:@"value"];
-
-                [finalResult addObject: finalItem];
-
+
+                @try
+                {
+                  [finalItem setObject:(NSString*)[item objectForKey:(__bridge id)(kSecAttrService)] forKey:@"service"];
+                  [finalItem setObject:(NSString*)[item objectForKey:(__bridge id)(kSecAttrAccount)] forKey:@"key"];
+                  [finalItem setObject:[[NSString alloc] initWithData:[item objectForKey:(__bridge id)(kSecValueData)] encoding:NSUTF8StringEncoding] forKey:@"value"];
+
+                  [finalResult addObject: finalItem];
+                }
+                @catch(NSException *exception){} // Ignore items with weird keys or values
             }
 
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-sensitive-info",
-  "version": "5.2.6",
+  "version": "5.2.7",
   "main": "RNSensitiveInfo.js",
   "description": "react-native-sensitive-info manages all data stored in Android Shared Preferences and iOS Keychain. You can set, get and delete keys/values using simple methods.",
   "scripts": {