--- old/src/share/classes/sun/awt/image/ByteBandedRaster.java 2014-03-26 21:26:48.602765600 +0400 +++ new/src/share/classes/sun/awt/image/ByteBandedRaster.java 2014-03-26 21:26:47.992688100 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -756,7 +756,7 @@ } for (int i = 0; i < data.length; i++) { - if (scanlineStride > data[i].length) { + if (height > 1 && scanlineStride > data[i].length) { throw new RasterFormatException("Incorrect scanline stride: " + scanlineStride); } --- old/src/share/classes/sun/awt/image/ByteComponentRaster.java 2014-03-26 21:26:52.223725400 +0400 +++ new/src/share/classes/sun/awt/image/ByteComponentRaster.java 2014-03-26 21:26:51.631150100 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -888,7 +888,7 @@ // we can be sure that width and height are greater than 0 if (scanlineStride < 0 || scanlineStride > (Integer.MAX_VALUE / height) || - scanlineStride > data.length) + (height > 1 && scanlineStride > data.length)) { // integer overflow throw new RasterFormatException("Incorrect scanline stride: " --- old/src/share/classes/sun/awt/image/BytePackedRaster.java 2014-03-26 21:26:55.922195000 +0400 +++ new/src/share/classes/sun/awt/image/BytePackedRaster.java 2014-03-26 21:26:55.327119500 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -1388,7 +1388,7 @@ if (scanlineStride < 0 || scanlineStride > (Integer.MAX_VALUE / height) || - scanlineStride > data.length) + (height > 1 && scanlineStride > data.length)) { throw new RasterFormatException("Invalid scanline stride"); } --- old/src/share/classes/sun/awt/image/IntegerComponentRaster.java 2014-03-26 21:26:59.631666100 +0400 +++ new/src/share/classes/sun/awt/image/IntegerComponentRaster.java 2014-03-26 21:26:59.061593700 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -657,7 +657,7 @@ // we can be sure that width and height are greater than 0 if (scanlineStride < 0 || scanlineStride > (Integer.MAX_VALUE / height) || - scanlineStride > data.length) + (height > 1 && scanlineStride > data.length)) { // integer overflow throw new RasterFormatException("Incorrect scanline stride: " --- old/src/share/classes/sun/awt/image/ShortBandedRaster.java 2014-03-26 21:27:03.265127500 +0400 +++ new/src/share/classes/sun/awt/image/ShortBandedRaster.java 2014-03-26 21:27:02.683053500 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -755,7 +755,7 @@ } for (int i = 0; i < data.length; i++) { - if (scanlineStride > data[i].length) { + if (height > 1 && scanlineStride > data[i].length) { throw new RasterFormatException("Incorrect scanline stride: " + scanlineStride); } --- old/src/share/classes/sun/awt/image/ShortComponentRaster.java 2014-03-26 21:27:06.982599500 +0400 +++ new/src/share/classes/sun/awt/image/ShortComponentRaster.java 2014-03-26 21:27:06.391024400 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -822,7 +822,7 @@ // we can be sure that width and height are greater than 0 if (scanlineStride < 0 || scanlineStride > (Integer.MAX_VALUE / height) || - scanlineStride > data.length) + (height > 1 && scanlineStride > data.length)) { // integer overflow throw new RasterFormatException("Incorrect scanline stride: " --- /dev/null 2014-03-26 21:27:10.000000000 +0400 +++ new/test/sun/awt/image/bug8038000.java 2014-03-26 21:27:10.073992100 +0400 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014, 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 8038000 + * + * @summary Verifies that we could create different rasters of height 1 + * and strideline which exceeds raster width. + * + * @run main bug8038000 + */ + +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.Raster; + +public class bug8038000 { + public static void main(String[] args) { + Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, 10, 1, 31, 3, + new int[]{2,1,0}, null); + Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT, 10, 1, 31, 3, + new int[]{2,1,0}, null); + Raster.createBandedRaster(DataBuffer.TYPE_BYTE, 10, 1, 31, + new int[] {0, 1,2}, new int[]{2,1,0}, null); + Raster.createBandedRaster(DataBuffer.TYPE_USHORT, 10, 1, 31, + new int[] {0, 1,2}, new int[]{2,1,0}, null); + Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 1, 31, + new int[] {0, 1,2}, new int[]{2,1,0}, null); + DataBufferByte buf = new DataBufferByte(10); + Raster.createPackedRaster(buf, 10, 1, 11, new int[]{0}, null); + + // No exceptions - Passed + } +}