From 2b2dd2fb40bf6422e30f8a855882d3a359e6fbb7 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Sat, 7 Mar 2015 21:41:38 +0100
Subject: [PATCH] TMI-107: JPEGSegmentImageInputStream now recovers from
 EOFException while parsing segments.

---
 .../jpeg/JPEGSegmentImageInputStream.java     |  8 +++-
 .../plugins/jpeg/JPEGImageReaderTest.java     | 41 +++++++++++++++++--
 .../jpeg/JPEGSegmentImageInputStreamTest.java |  1 +
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
index 2a3c0342..ce42f658 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
@@ -74,7 +74,9 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
 
         if (streamPos >= segment.end()) {
             // Go forward in cache
-            while (++currentSegment < segments.size()) {
+            int cachedSegment = currentSegment;
+            while (++cachedSegment < segments.size()) {
+                currentSegment = cachedSegment;
                 segment = segments.get(currentSegment);
 
                 if (streamPos >= segment.start && streamPos < segment.end()) {
@@ -157,7 +159,9 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
         }
         else if (streamPos < segment.start) {
             // Go back in cache
-            while (--currentSegment >= 0) {
+            int cachedSegment = currentSegment;
+            while (--cachedSegment >= 0) {
+                currentSegment = cachedSegment;
                 segment = segments.get(currentSegment);
 
                 if (streamPos >= segment.start && streamPos < segment.end()) {
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index af879364..b9a4e6f6 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -417,19 +417,52 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
     @Ignore("Known issue in com.sun...JPEGMetadata")
     @Test
     public void testExifStandardMetadataColorSpaceTypeYCbCr() {
-        // These reports RGB (by Exif non-presence?), while the data is really YCbCr
+        // These reports RGB in standard metadata, while the data is really YCbCr
         fail("/jpeg/exif-jpeg-thumbnail-sony-dsc-p150-inverted-colors.jpg");
         fail("/jpeg/exif-pspro-13-inverted-colors.jpg");
         fail("/jpeg/no-jfif-ycbcr.jpg");
     }
 
+    @Test
+    public void testBrokenReadRasterAfterGetMetadataException() throws IOException {
+        // See issue 107, from PDFBox team
+        JPEGImageReader reader = createReader();
+
+        try {
+            for (TestData broken : getBrokenTestData()) {
+                reader.setInput(broken.getInputStream());
+
+                try {
+                    reader.getImageMetadata(0);
+                }
+                catch (IOException ignore) {
+                    // Expected IOException here, due to broken file
+//                    ignore.printStackTrace();
+                }
+
+                try {
+                    reader.readRaster(0, null);
+                }
+                catch (IOException expected) {
+                    // Should not throw anything other than IOException here
+                    if (!(expected instanceof EOFException)) {
+                        assertNotNull(expected.getMessage());
+                    }
+                }
+            }
+        }
+        finally {
+            reader.dispose();
+        }
+    }
+
     @Test
     public void testBrokenRead() throws IOException {
         JPEGImageReader reader = createReader();
 
         try {
             for (TestData broken : getBrokenTestData()) {
-                reader.setInput(ImageIO.createImageInputStream(broken.getInput()));
+                reader.setInput(broken.getInputStream());
 
                 try {
                     reader.read(0);
@@ -455,7 +488,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
 
         try {
             for (TestData broken : getBrokenTestData()) {
-                reader.setInput(ImageIO.createImageInputStream(broken.getInput()));
+                reader.setInput(broken.getInputStream());
 
                 Dimension exptectedSize = broken.getDimension(0);
 
@@ -484,7 +517,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
 
         try {
             for (TestData broken : getBrokenTestData()) {
-                reader.setInput(ImageIO.createImageInputStream(broken.getInput()));
+                reader.setInput(broken.getInputStream());
 
                 try {
                     reader.getImageMetadata(0);
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
index b42fa9d2..edb4f0fe 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
@@ -56,6 +56,7 @@ import static org.junit.Assert.*;
 public class JPEGSegmentImageInputStreamTest {
     static {
         IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi());
+        ImageIO.setUseCache(false);
     }
 
     protected URL getClassLoaderResource(final String pName) {