possible crash fix (#4215)

osmandapp · Dec 18, 2024 · cbf08dd · cbf08dd
1 parent cfa1d00
commit cbf08dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Sources/Helpers/OALocationParser.mm b/Sources/Helpers/OALocationParser.mm
@@ -521,12 +521,12 @@ + (NSString *)prepareLatLonWithDecimalCommas:(NSString *)ll
     for (int i = DIGITS_BEFORE_COMMA, first = -1; i < ll.length - DIGITS_AFTER_COMMA; i++) {
         if ([ll characterAtIndex:i] == ',') {
             int before = 0, after = 0;
-            for (int j = i - 1; j >= i - DIGITS_BEFORE_COMMA; j--) {
+            for (int j = i - 1; j >= i - DIGITS_BEFORE_COMMA && j >= 0; j--) {
                 if ([[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[ll characterAtIndex:j]]) {
                     before++;
                 }
             }
-            for (int j = i + 1; j <= i + DIGITS_AFTER_COMMA && before >= DIGITS_BEFORE_COMMA; j++) {
+            for (int j = i + 1; j <= i + DIGITS_AFTER_COMMA && j < ll.length && before >= DIGITS_BEFORE_COMMA; j++) {
                 if ([[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[ll characterAtIndex:j]]) {
                     after++;
                 }