Changeset 1049 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2008-10-21T20:49:20+02:00 (16 years ago)

Author:

cbrill

Message:

Fix bug #1626 (incomplete NMEA files cause crashes)

File:

• trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -9 +9 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 
@@ -140 +141 @@
                                 // XXX: No need for it: String checksum = nmeaAndChecksum[1];
                                 String[] e = nmea.split(",");
+                                if (e.length == 0) {
+                                    continue;
+                                }
                                 if (NMEA_TYPE.GPRMC.equals(e[TYPE])) {
                                         LatLon latLon = parseLatLon(e);
@@ -157 +161 @@
 
         private LatLon parseLatLon(String[] e) throws NumberFormatException {
-                String widthNorth = e[GPRMC.WIDTH_NORTH.position].trim();
+            // If the array looks bogus don't try to get valuable information from it
+            if (e.length != 13) {
+                return null;
+            }
+        String widthNorth = e[GPRMC.WIDTH_NORTH.position].trim();
                 String lengthEast = e[GPRMC.LENGTH_EAST.position].trim();
                 if ("".equals(widthNorth) || "".equals(lengthEast)) {