From d375707075b95de574cc9d48a2e13e2f9c862fd7 Mon Sep 17 00:00:00 2001 From: Jayathirth D V Date: Tue, 2 Aug 2016 15:55:03 +0530 Subject: [PATCH] 8160943: skipImage() in JPEGImageReader class throws IIOException if we have gaps between markers in Jpeg image Reviewed-by: prr, flar --- .../imageio/plugins/jpeg/JPEGImageReader.java | 1 + .../plugins/jpeg/ReadAllThumbnailsTest.java | 126 ++++++++++++++++++ .../javax/imageio/plugins/jpeg/thumbimg.jpg | Bin 0 -> 9585 bytes 3 files changed, 127 insertions(+) create mode 100644 jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java create mode 100644 jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java index e7911bbea81..6fe6987cdfc 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java @@ -561,6 +561,7 @@ public class JPEGImageReader extends ImageReader { throw new IOException("skipImage : Found extra SOI" + " marker before getting to EOI"); case 0: + case 255: // markers which doesn't contain length data case JPEG.RST0: case JPEG.RST1: diff --git a/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java b/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java new file mode 100644 index 00000000000..04d5e0c790b --- /dev/null +++ b/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 4958271 8160943 + * @summary This test verifies that ImageReader.readAll() method is able to read + * all the thumbnails present in the input source without throwing any + * exception while reading through Jpeg data. + * @run main ReadAllThumbnailsTest + */ + +import java.util.Iterator; +import java.io.File; +import javax.imageio.IIOImage; +import javax.imageio.ImageIO; +import javax.imageio.ImageReader; +import javax.imageio.stream.ImageInputStream; + +public class ReadAllThumbnailsTest { + + public ReadAllThumbnailsTest() { + + try { + ImageReader reader = null; + + String fileName = "thumbimg.jpg"; + String sep = System.getProperty("file.separator"); + String dir = System.getProperty("test.src", "."); + String filePath = dir+sep+fileName; + System.out.println("Test file: " + filePath); + File f = new File(filePath); + + ImageInputStream iis = ImageIO.createImageInputStream(f); + Iterator readerIt = ImageIO.getImageReaders(iis); + if (readerIt.hasNext()) { + reader = (ImageReader) readerIt.next(); + } + + if (reader == null) { + error("FAIL: Reader is not available for reading a " + + "JPG image with thumbnails. Test Aborted !!"); + } + + reader.setInput(iis); + + if (!reader.readerSupportsThumbnails()) { + error("FAIL: JPG Reader fails to support thumbnails." + + " Test aborted !!"); + } + + int numThumbnails = reader.getNumThumbnails(0); + if (numThumbnails <= 0) { + error(" FAIL: Reader.getNumThumbnails() returns 0 when the " + + "input image contains some thumbnails"); + } + IIOImage iioImg = reader.readAll(0, null); + int thumbnailsRead = iioImg.getNumThumbnails(); + + if (numThumbnails == thumbnailsRead) { + System.out.println("PASS: Thumbnails are read properly by" + + " ImageReader.readAll(index, readParam) "); + } else { + error("FAIL: Some of the thumbnails are not read" + + " from the input source when calling" + + " ImageReader.readAll(index, readParam) "); + } + + iis = ImageIO.createImageInputStream(f); + reader.setInput(iis); + + iioImg = null; + Iterator imgIter = reader.readAll(null); + if (imgIter.hasNext()) { + iioImg = (IIOImage) imgIter.next(); + thumbnailsRead = iioImg.getNumThumbnails(); + + if (numThumbnails == thumbnailsRead) { + System.out.println("PASS: Thumbnails are read properly by" + + " ImageReader.readAll(Iter)"); + } else { + error("FAIL: Some of the thumbnails are not read " + + "from the input source when calling" + + " ImageReader.readAll(Iter)"); + } + } else { + error("FAIL: ImageReader.readAll(Iter) fails to read the image" + + " & thumbnails from the input source"); + } + + } catch (Exception e) { + error(" FAIL: The following exception is thrown by " + + "ImageReader.readAll() method when input source contains " + + "some thumbnails. Exception: " + e.toString()); + } + + } + + public final void error(String mesg) { + throw new RuntimeException(mesg); + } + + public static void main(String args[]) { + ReadAllThumbnailsTest test = new ReadAllThumbnailsTest(); + } +} diff --git a/jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg b/jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8370755d24f5da8deef6d0a15f40333d80c7fab2 GIT binary patch literal 9585 zcmex=vcDq>wPbh^&;noUD|LjDm`ux`L99 zvW$#|xu%YRp^1r!yt<{Wg^`V(v567L5JpZ;P9AO^30__aBSjfSBa*@Y0}O&3j5>@u z%#2D5OoEKef{g!wh=DOELf4NWZ* zQ!{f5ODks=S2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ&aO$5r%atT zea6gLixw|gx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds_3+W-Cr_U} zfAR9w$4{TXeEs(Q$Io9Ne=#yJL%anfAs$2XmmttzOe`$SEbJhEF*20{F|!~GtD+&B zkYgZwVxh2-Q6qGeQ$1KQT&v0!~m-c7pPYjE?G)D1g7>uTY(KIlc1_oamVE%s-04lv~(EtDd literal 0 HcmV?d00001