From a0bd5034ab69828a1b3b8a8fde6f064475885df3 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 12 Mar 2015 21:16:16 +0100
Subject: [PATCH] BMP-testcase from OpenJDK.

---
 .../plugins/bmp/BMPImageReaderTest.java       |  21 +++++++++++++++---
 .../resources/broken-bmp/corrupted-bmp.bmp    | Bin 0 -> 1661 bytes
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 imageio/imageio-bmp/src/test/resources/broken-bmp/corrupted-bmp.bmp

diff --git a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
index d1417675..80ae803b 100755
--- a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
+++ b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
@@ -6,6 +6,8 @@ import org.mockito.InOrder;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import javax.imageio.IIOException;
+import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.event.IIOReadProgressListener;
@@ -23,9 +25,7 @@ import java.util.List;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 /**
  * BMPImageReaderTest
@@ -171,6 +171,21 @@ public class BMPImageReaderTest extends ImageReaderAbstractTestCase<BMPImageRead
         }
     }
 
+    @Test(expected = IIOException.class)
+    public void testReadCorruptCausesIIOException() throws IOException {
+        // See https://bugs.openjdk.java.net/browse/JDK-8066904
+        // NullPointerException when calling ImageIO.read(InputStream) with corrupt BMP
+        BMPImageReader reader = createReader();
+
+        try {
+            reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/broken-bmp/corrupted-bmp.bmp")));
+            reader.read(0);
+        }
+        finally {
+            reader.dispose();
+        }
+    }
+
     @Test
     public void testAddIIOReadProgressListenerCallbacksJPEG() {
         ImageReader reader = createReader();
diff --git a/imageio/imageio-bmp/src/test/resources/broken-bmp/corrupted-bmp.bmp b/imageio/imageio-bmp/src/test/resources/broken-bmp/corrupted-bmp.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..d199b3fd24c06767541f4b2a631dd8975bcff051
GIT binary patch
literal 1661
zcmeH{zfQw25XMs>QK?c@@dO@WWMRdK0VdQpU@1}`fT;^%>zGIItF%+t@(2`V=$a^t
zPqKV`{*$E1%zzM<Z0FbS{Ka>@_WtSZJn`ce>lNmUpLg+7FP$vRoM3jNg4O{Z{v=nT
zOVQ`2W6sz-+ax(d1h$y}G(4sz@}6-dnQ+Us3tn)?It?#qbt8w&k#$>N5p-&KJK`d6
z-Rc3k8F4w{<Ii$68TuVYy#4Yz`P*StLtdzGf8yMxOx*L<O1m*VPg$CcDcX2@$)X}%
zs8AoWYgPxMQ_dz-7b^6t(?2e#EV7<=4dumW&v{9OE2{gxUHtJ#8NxklaCsyJJI}_f
zxXDSix-kvc1*u)9H%u9c13JR_84Xrix;FAm4Qu6k!c0BaH5=hrOV6*wR%p0|dfAm@
zSH&~$XV+i}WD)pLM-KP1OXEa8oS$6`nT1KC?9ZcF<&Z-^z9%y3coFk1=^6caNK%A3
ze`tIBZAeC2N5+ODNGY=MQTSOz#u1Ei#Bd$xV#IR9uo%Su^RKAKd^VpwKP+#qzX4Sb
BtUCYz

literal 0
HcmV?d00001