Changeset 12937 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

fix #14961 - catch IAE when decoding base64 data

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/protocols/data/DataConnection.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (1 diff)

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);
+        }
     }
 }

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

@@ -977 +977 @@
             String data = m.group(3);
             byte[] bytes;
-            if (";base64".equals(base64)) {
-                bytes = Base64.getDecoder().decode(data);
-            } else {
-                try {
+            try {
+                if (";base64".equals(base64)) {
+                    bytes = Base64.getDecoder().decode(data);
+                } else {
                     bytes = Utils.decodeUrl(data).getBytes(StandardCharsets.UTF_8);
-                } catch (IllegalArgumentException ex) {
-                    Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex);
-                    return null;
-                }
+                }
+            } catch (IllegalArgumentException ex) {
+                Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex);
+                return null;
             }
             String mediatype = m.group(1);