#294 Fixed regression, reading JPEGs containing strange APPn markers …

…without identifier string
haraldk · Nov 29, 2016 · e189b5e · e189b5e
1 parent f0316f7
commit e189b5e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Application.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Application.java
@@ -29,7 +29,6 @@
 package com.twelvemonkeys.imageio.plugins.jpeg;
 
 import com.twelvemonkeys.imageio.metadata.jpeg.JPEG;
-import com.twelvemonkeys.lang.Validate;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInput;
@@ -48,10 +47,10 @@ class Application extends Segment {
     final String identifier;
     final byte[] data;
 
-    Application(int marker, final String identifier, final byte[] data) {
+    Application(final int marker, final String identifier, final byte[] data) {
         super(marker);
 
-        this.identifier = Validate.notEmpty(identifier, "identifier");
+        this.identifier = identifier; // NOTE: Some JPEGs contain APP segments without NULL-terminated identifier
         this.data = data;
     }
 

diff --git a/...io/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java b/...io/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
@@ -723,7 +723,7 @@ private void initHeader() throws IOException {
                 catch (IOException e) {
                     // TODO: Handle bad segments better, for now, just ignore any bad APP markers
                     if (segment.marker() >= JPEG.APP0 && JPEG.APP15 >= segment.marker()) {
-                        processWarningOccurred("Bogus " +segment.identifier() + " segment, ignoring");
+                        processWarningOccurred("Bogus APP" + (segment.marker() & 0x0f) + "/" + segment.identifier() + " segment, ignoring");
                         continue;
                     }
 

diff --git a/...mageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/...mageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -94,6 +94,7 @@ protected List<TestData> getTestData() {
                 new TestData(getClassLoaderResource("/jpeg/jfif-padded-segments.jpg"), new Dimension(20, 45)),
                 new TestData(getClassLoaderResource("/jpeg/0x00-to-0xFF-between-segments.jpg"), new Dimension(16, 16)),
                 new TestData(getClassLoaderResource("/jpeg/jfif-bogus-empty-jfif-segment.jpg"), new Dimension(942, 714)),
+                new TestData(getClassLoaderResource("/jpeg/app-marker-missing-null-term.jpg"), new Dimension(200, 150)),
                 new TestData(getClassLoaderResource("/jpeg/jfif-16bit-dqt.jpg"), new Dimension(204, 131)),
                 new TestData(getClassLoaderResource("/jpeg-lossless/8_ls.jpg"), new Dimension(800, 535)),  // Lossless gray, 8 bit
                 new TestData(getClassLoaderResource("/jpeg-lossless/16_ls.jpg"), new Dimension(800, 535)),  // Lossless gray, 16 bit

diff --git a/imageio/imageio-jpeg/src/test/resources/jpeg/app-marker-missing-null-term.jpg b/imageio/imageio-jpeg/src/test/resources/jpeg/app-marker-missing-null-term.jpg