infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-06 18:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

8383605: Incomplete input validation on the bands parameters in j.a.i.Raster

Browse Source 
Reviewed-by: aivanov, jdv, avu
This commit is contained in:
Phil Race 2026-05-29 18:42:17 +00:00
parent c09e403385
commit cd0b9fbeec
2 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.desktop/share/classes/java/awt/image/Raster.java
View File

@ -200,8 +200,8 @@ public class Raster {
* @throws IllegalArgumentException if {@code bands} is less than 1
* @throws IllegalArgumentException if {@code w} and {@code h} are not
* both > 0
* @throws IllegalArgumentException if the product of {@code w}
* and {@code h} is greater than {@code Integer.MAX_VALUE}
* @throws IllegalArgumentException if the product of {@code w},
* {@code h} and {@code bands} is greater than {@code Integer.MAX_VALUE}
* @throws RasterFormatException if computing either
* {@code location.x + w} or
* {@code location.y + h} results in integer overflow
@ -218,6 +218,14 @@ public class Raster {
throw new IllegalArgumentException("Dimensions (width="+w+
" height="+h+") are too large");
}
if (bands < 1) {
throw new IllegalArgumentException("Number of bands ("+
bands+") must be greater than 0");
}
long slsz = (long)w * bands;
if (slsz > Integer.MAX_VALUE) {
throw new IllegalArgumentException("width * bands is too large");
}
int[] bandOffsets = new int[bands];
for (int i = 0; i < bands; i++) {
bandOffsets[i] = i;

60
test/jdk/java/awt/image/Raster/InterleavedRasterTest.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright (c) 2026, 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 8383605
* @summary test some out of bounds parameters for createInterleavedRaster()
*/
import java.awt.image.DataBuffer;
import java.awt.image.Raster;
public class InterleavedRasterTest {
public static void main(String[] args) {
int w = 1;
int h = 1;
int b = -1;
test(w, h, b);
w = 100_000;
h = 1;
b = 100_000;
test(w, h, b);
w = 10_000;
h = 10_000;
b = 10_000;
test(w, h, b);
}
static void test(int w, int h, int b) {
try {
Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, b, null);
throw new RuntimeException("No IllegalArgumentException");
} catch (IllegalArgumentException e) {
}
}
}