infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-29 12:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

8191174: PngReader throws IllegalArgumentException because ScanlineStride calculation logic is not proper

Browse Source 
Reviewed-by: serb, bpb, pnarayanan
This commit is contained in:
Jayathirth D V 2018-01-17 10:58:22 +05:30
parent 15ecb4705f
commit a559c8b653
2 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2018, 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
@ -997,7 +997,9 @@ public class PNGImageReader extends ImageReader {
}
int inputBands = inputBandsForColorType[metadata.IHDR_colorType];
int bytesPerRow = (inputBands*passWidth*metadata.IHDR_bitDepth + 7)/8;
int bitsPerRow = Math.
multiplyExact((inputBands * metadata.IHDR_bitDepth), passWidth);
int bytesPerRow = (bitsPerRow + 7) / 8;
// Read the image row-by-row
for (int srcY = 0; srcY < passHeight; srcY++) {
@ -1048,7 +1050,8 @@ public class PNGImageReader extends ImageReader {
int bytesPerPixel = (bitDepth == 16) ? 2 : 1;
bytesPerPixel *= inputBands;
int bytesPerRow = (inputBands*passWidth*bitDepth + 7)/8;
int bitsPerRow = Math.multiplyExact((inputBands * bitDepth), passWidth);
int bytesPerRow = (bitsPerRow + 7) / 8;
int eltsPerRow = (bitDepth == 16) ? bytesPerRow/2 : bytesPerRow;
// If no pixels need updating, just skip the input data

57
test/jdk/javax/imageio/plugins/png/PngReaderLargeWidthStrideTest.java Normal file
View File

@ -0,0 +1,57 @@
/*
* Copyright (c) 2018, 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 8191174
* @summary Test verifies that PNGImageReader doesn't throw any undocumented
* Exception because of faulty calculation of scanline stride in
* PNGImageReader.
* @run main PngReaderLargeWidthStrideTest
*/
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Base64;
import javax.imageio.IIOException;
import javax.imageio.ImageIO;
public class PngReaderLargeWidthStrideTest {
private static String inputImageBase64 = "iVBORw0KGgoAAAANSUhEUk////8AAAA"
+ "BCAAAAAA6fptVAAAACklEQVQYV2P4DwABAQEAWk1v8QAAAABJRU5ErkJgggo=";
public static void main(String[] args) throws Exception {
byte[] inputBytes = Base64.getDecoder().decode(inputImageBase64);
InputStream in = new ByteArrayInputStream(inputBytes);
try {
ImageIO.read(in);
} catch (IIOException e) {
// Do nothing we expect it to throw IIOException, but if it throws
// any other exception test will fail.
}
}
}