(ios) fix: Check NSDictionary constructed from native CLLocation data…

… is valid for conversion to JSON before attempting conversion. Prevents crashes due to values invalid for JSON conversion such as INFINITY.
apache · Aug 1, 2022 · da513a3 · da513a3
1 parent aef8395
commit da513a3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/ios/CDVLocation.m b/src/ios/CDVLocation.m
@@ -299,8 +299,13 @@ - (void)returnLocationInfo:(NSString*)callbackId andKeepCallback:(BOOL)keepCallb
         [returnInfo setObject:[NSNumber numberWithDouble:lInfo.coordinate.latitude] forKey:@"latitude"];
         [returnInfo setObject:[NSNumber numberWithDouble:lInfo.coordinate.longitude] forKey:@"longitude"];
 
-        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:returnInfo];
-        [result setKeepCallbackAsBool:keepCallback];
+        if([NSJSONSerialization isValidJSONObject:returnInfo]){
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:returnInfo];
+            [result setKeepCallbackAsBool:keepCallback];
+        }else{
+            // return error
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageToErrorObject:POSITIONUNAVAILABLE];
+        }
     }
     if (result) {
         [self.commandDelegate sendPluginResult:result callbackId:callbackId];