Changeset 14159 in josm for trunk

Timestamp:

2018-08-16T20:07:05+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16633 - add robustness against invalid time entries in GPX files

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/WayPoint.java (modified) (2 diffs)
• io/OsmServerUserInfoReader.java (modified) (3 diffs)
• tools/ExifReader.java (modified) (2 diffs)
• tools/date/DateUtils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -166 +167 @@
                 time = date.getTime() / 1000.;
                 return date;
-            } catch (UncheckedParseException e) {
+            } catch (UncheckedParseException | DateTimeException e) {
                 Logging.warn(e);
                 time = 0;

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.time.DateTimeException;
 import java.util.LinkedList;
 import java.util.List;
@@ -16 +17 @@
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.XmlParsingException;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -129 +131 @@
 
             return userInfo;
-        } catch (XPathException e) {
+        } catch (XPathException | UncheckedParseException | DateTimeException e) {
             throw new XmlParsingException(e);
         }

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -5 +5 @@
 import java.io.File;
 import java.io.IOException;
+import java.time.DateTimeException;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -117 +118 @@
                 return date;
             }
-        } catch (UncheckedParseException e) {
+        } catch (UncheckedParseException | DateTimeException e) {
             Logging.error(e);
         }

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -5 +5 @@
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.time.DateTimeException;
 import java.time.Instant;
 import java.time.ZoneId;
@@ -68 +69 @@
      * @return The date
      * @throws UncheckedParseException if the date does not match any of the supported date formats
+     * @throws DateTimeException if the value of any field is out of range, or if the day-of-month is invalid for the month-year
      */
     public static synchronized Date fromString(String str) {
@@ -78 +80 @@
      * @return The date in milliseconds since epoch
      * @throws UncheckedParseException if the date does not match any of the supported date formats
+     * @throws DateTimeException if the value of any field is out of range, or if the day-of-month is invalid for the month-year
      */
     public static synchronized long tsFromString(String str) {