Changeset 32642 in osm for applications

Timestamp:

2016-07-12T17:28:07+02:00 (9 years ago)

Author:

floscher

Message:

Fix NegativeArraySizeException in ImageUtil.ImageFileFilter

This was reported as https://josm.openstreetmap.de/ticket/13096 .
The fix is accompanied by a testcase to prevent future regressions.

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtil.java (modified) (1 diff)
• test/data/zeroByteFile (added)
• test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtil.java

@@ -146 +146 @@
       try (FileInputStream fis = new FileInputStream(f)) {
         int numBytes = fis.read(magic);
-        return Arrays.equals(JFIF_MAGIC, Arrays.copyOf(magic, Math.min(numBytes, JFIF_MAGIC.length)))
-            || Arrays.equals(PNG_MAGIC, Arrays.copyOf(magic, Math.min(numBytes, PNG_MAGIC.length)));
+        return numBytes >= 0 && (
+          Arrays.equals(JFIF_MAGIC, Arrays.copyOf(magic, Math.min(numBytes, JFIF_MAGIC.length)))
+          || Arrays.equals(PNG_MAGIC, Arrays.copyOf(magic, Math.min(numBytes, PNG_MAGIC.length)))
+        );
       } catch (FileNotFoundException e) {
         return false;
       } catch (IOException e) {
+        Main.warn("IO-exception while reading file "+f.getAbsolutePath());
         return false;
       }

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -91 +92 @@
   }
 
+  @Test
+  public void testFileFilterAgainstEmptyFile() throws URISyntaxException {
+    File f = new File(ImageUtil.class.getResource("/zeroByteFile").toURI());
+    assertFalse(ImageUtil.IMAGE_FILE_FILTER.accept(f));
+  }
+
 }