Changeset 12937 in josm for trunk/src/org/openstreetmap/josm/io/protocols

Timestamp:

2017-10-07T22:39:09+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14961 - catch IAE when decoding base64 data

File:

• trunk/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/protocols/data/DataConnection.java

@@ -8 +8 @@
 import java.net.URLConnection;
 import java.util.Base64;
+
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -32 +34 @@
     @Override
     public InputStream getInputStream() throws IOException {
-        return new ByteArrayInputStream(Base64.getDecoder().decode(url.toString().replaceFirst("^.*;base64,", "")));
+        try {
+            return new ByteArrayInputStream(Base64.getDecoder().decode(url.toString().replaceFirst("^.*;base64,", "")));
+        } catch (IllegalArgumentException e) {
+            throw BugReport.intercept(e).put("url", url);
+        }
     }
 }