/hg/release/icedtea7-forest-2.4/jdk: 2 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Mar 4 20:33:47 PST 2013
changeset 19d36a087e4f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=19d36a087e4f
author: bae
date: Thu Feb 14 19:51:51 2013 +0400
8007014: Improve image handling
Reviewed-by: prr, mschoene, jgodinez
changeset 3d0b72d4c0f9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3d0b72d4c0f9
author: bae
date: Thu Feb 21 11:25:43 2013 +0400
8007675: Improve color conversion
Reviewed-by: prr, jgodinez
diffstat:
src/share/classes/sun/awt/image/ByteComponentRaster.java | 12 +-
src/share/classes/sun/awt/image/BytePackedRaster.java | 26 +-
src/share/classes/sun/awt/image/IntegerComponentRaster.java | 71 +++-
src/share/classes/sun/awt/image/IntegerInterleavedRaster.java | 27 +-
src/share/classes/sun/awt/image/ShortComponentRaster.java | 12 +-
src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java | 101 +++++-
src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java | 160 +++++----
src/share/native/sun/awt/image/awt_parseImage.c | 1 +
src/share/native/sun/awt/medialib/awt_ImagingLib.c | 32 +-
src/share/native/sun/awt/medialib/mlib_ImageCreate.c | 33 +-
src/share/native/sun/awt/medialib/safe_alloc.h | 6 -
src/share/native/sun/awt/medialib/safe_math.h | 35 ++
12 files changed, 379 insertions(+), 137 deletions(-)
diffs (truncated from 887 to 500 lines):
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/awt/image/ByteComponentRaster.java
--- a/src/share/classes/sun/awt/image/ByteComponentRaster.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/awt/image/ByteComponentRaster.java Thu Feb 21 11:25:43 2013 +0400
@@ -868,6 +868,15 @@
* or if data buffer has not enough capacity.
*/
protected final void verify() {
+ /* Need to re-verify the dimensions since a sample model may be
+ * specified to the constructor
+ */
+ if (width <= 0 || height <= 0 ||
+ height > (Integer.MAX_VALUE / width))
+ {
+ throw new RasterFormatException("Invalid raster dimension");
+ }
+
for (int i = 0; i < dataOffsets.length; i++) {
if (dataOffsets[i] < 0) {
throw new RasterFormatException("Data offsets for band " + i
@@ -905,13 +914,14 @@
lastPixelOffset += lastScanOffset;
for (int i = 0; i < numDataElements; i++) {
- size = lastPixelOffset + dataOffsets[i];
if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
throw new RasterFormatException("Incorrect band offset: "
+ dataOffsets[i]);
}
+ size = lastPixelOffset + dataOffsets[i];
+
if (size > maxSize) {
maxSize = size;
}
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/awt/image/BytePackedRaster.java
--- a/src/share/classes/sun/awt/image/BytePackedRaster.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/awt/image/BytePackedRaster.java Thu Feb 21 11:25:43 2013 +0400
@@ -1368,11 +1368,35 @@
throw new RasterFormatException("Data offsets must be >= 0");
}
+ /* Need to re-verify the dimensions since a sample model may be
+ * specified to the constructor
+ */
+ if (width <= 0 || height <= 0 ||
+ height > (Integer.MAX_VALUE / width))
+ {
+ throw new RasterFormatException("Invalid raster dimension");
+ }
+
+
+ /*
+ * pixelBitstride was verified in constructor, so just make
+ * sure that it is safe to multiply it by width.
+ */
+ if ((width - 1) > Integer.MAX_VALUE / pixelBitStride) {
+ throw new RasterFormatException("Invalid raster dimension");
+ }
+
+ if (scanlineStride < 0 ||
+ scanlineStride > (Integer.MAX_VALUE / height))
+ {
+ throw new RasterFormatException("Invalid scanline stride");
+ }
+
int lastbit = (dataBitOffset
+ (height-1) * scanlineStride * 8
+ (width-1) * pixelBitStride
+ pixelBitStride - 1);
- if (lastbit / 8 >= data.length) {
+ if (lastbit < 0 || lastbit / 8 >= data.length) {
throw new RasterFormatException("raster dimensions overflow " +
"array bounds");
}
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/awt/image/IntegerComponentRaster.java
--- a/src/share/classes/sun/awt/image/IntegerComponentRaster.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/awt/image/IntegerComponentRaster.java Thu Feb 21 11:25:43 2013 +0400
@@ -208,7 +208,7 @@
" SinglePixelPackedSampleModel");
}
- verify(false);
+ verify();
}
@@ -629,16 +629,26 @@
}
/**
- * Verify that the layout parameters are consistent with
- * the data. If strictCheck
- * is false, this method will check for ArrayIndexOutOfBounds conditions. If
- * strictCheck is true, this method will check for additional error
- * conditions such as line wraparound (width of a line greater than
- * the scanline stride).
- * @return String Error string, if the layout is incompatible with
- * the data. Otherwise returns null.
+ * Verify that the layout parameters are consistent with the data.
+ *
+ * The method verifies whether scanline stride and pixel stride do not
+ * cause an integer overflow during calculation of a position of the pixel
+ * in data buffer. It also verifies whether the data buffer has enough data
+ * to correspond the raster layout attributes.
+ *
+ * @throws RasterFormatException if an integer overflow is detected,
+ * or if data buffer has not enough capacity.
*/
- private void verify (boolean strictCheck) {
+ protected final void verify() {
+ /* Need to re-verify the dimensions since a sample model may be
+ * specified to the constructor
+ */
+ if (width <= 0 || height <= 0 ||
+ height > (Integer.MAX_VALUE / width))
+ {
+ throw new RasterFormatException("Invalid raster dimension");
+ }
+
if (dataOffsets[0] < 0) {
throw new RasterFormatException("Data offset ("+dataOffsets[0]+
") must be >= 0");
@@ -647,17 +657,46 @@
int maxSize = 0;
int size;
- for (int i=0; i < numDataElements; i++) {
- size = (height-1)*scanlineStride + (width-1)*pixelStride +
- dataOffsets[i];
+ // we can be sure that width and height are greater than 0
+ if (scanlineStride < 0 ||
+ scanlineStride > (Integer.MAX_VALUE / height))
+ {
+ // integer overflow
+ throw new RasterFormatException("Incorrect scanline stride: "
+ + scanlineStride);
+ }
+ int lastScanOffset = (height - 1) * scanlineStride;
+
+ if (pixelStride < 0 ||
+ pixelStride > (Integer.MAX_VALUE / width))
+ {
+ // integer overflow
+ throw new RasterFormatException("Incorrect pixel stride: "
+ + pixelStride);
+ }
+ int lastPixelOffset = (width - 1) * pixelStride;
+
+ if (lastPixelOffset > (Integer.MAX_VALUE - lastScanOffset)) {
+ // integer overflow
+ throw new RasterFormatException("Incorrect raster attributes");
+ }
+ lastPixelOffset += lastScanOffset;
+
+ for (int i = 0; i < numDataElements; i++) {
+ if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
+ throw new RasterFormatException("Incorrect band offset: "
+ + dataOffsets[i]);
+ }
+
+ size = lastPixelOffset + dataOffsets[i];
+
if (size > maxSize) {
maxSize = size;
}
}
if (data.length < maxSize) {
- throw new RasterFormatException("Data array too small (should be "+
- maxSize
- +" but is "+data.length+" )");
+ throw new RasterFormatException("Data array too small (should be "
+ + maxSize + " )");
}
}
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/awt/image/IntegerInterleavedRaster.java
--- a/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java Thu Feb 21 11:25:43 2013 +0400
@@ -151,7 +151,7 @@
throw new RasterFormatException("IntegerInterleavedRasters must have"+
" SinglePixelPackedSampleModel");
}
- verify(false);
+ verify();
}
@@ -540,31 +540,6 @@
return createCompatibleWritableRaster(width,height);
}
- /**
- * Verify that the layout parameters are consistent with
- * the data. If strictCheck
- * is false, this method will check for ArrayIndexOutOfBounds conditions. If
- * strictCheck is true, this method will check for additional error
- * conditions such as line wraparound (width of a line greater than
- * the scanline stride).
- * @return String Error string, if the layout is incompatible with
- * the data. Otherwise returns null.
- */
- private void verify (boolean strictCheck) {
- int maxSize = 0;
- int size;
-
- size = (height-1)*scanlineStride + (width-1) + dataOffsets[0];
- if (size > maxSize) {
- maxSize = size;
- }
- if (data.length < maxSize) {
- throw new RasterFormatException("Data array too small (should be "+
- maxSize
- +" but is "+data.length+" )");
- }
- }
-
public String toString() {
return new String ("IntegerInterleavedRaster: width = "+width
+" height = " + height
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/awt/image/ShortComponentRaster.java
--- a/src/share/classes/sun/awt/image/ShortComponentRaster.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/awt/image/ShortComponentRaster.java Thu Feb 21 11:25:43 2013 +0400
@@ -802,6 +802,15 @@
* or if data buffer has not enough capacity.
*/
protected final void verify() {
+ /* Need to re-verify the dimensions since a sample model may be
+ * specified to the constructor
+ */
+ if (width <= 0 || height <= 0 ||
+ height > (Integer.MAX_VALUE / width))
+ {
+ throw new RasterFormatException("Invalid raster dimension");
+ }
+
for (int i = 0; i < dataOffsets.length; i++) {
if (dataOffsets[i] < 0) {
throw new RasterFormatException("Data offsets for band " + i
@@ -839,12 +848,13 @@
lastPixelOffset += lastScanOffset;
for (int i = 0; i < numDataElements; i++) {
- size = lastPixelOffset + dataOffsets[i];
if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
throw new RasterFormatException("Incorrect band offset: "
+ dataOffsets[i]);
}
+ size = lastPixelOffset + dataOffsets[i];
+
if (size > maxSize) {
maxSize = size;
}
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
--- a/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java Thu Feb 21 11:25:43 2013 +0400
@@ -99,50 +99,75 @@
int offset;
Object dataArray;
- private LCMSImageLayout(int np, int pixelType, int pixelSize) {
+ private int dataArrayLength; /* in bytes */
+
+ private LCMSImageLayout(int np, int pixelType, int pixelSize)
+ throws ImageLayoutException
+ {
this.pixelType = pixelType;
width = np;
height = 1;
- nextRowOffset = np*pixelSize;
+ nextRowOffset = safeMult(pixelSize, np);
offset = 0;
}
private LCMSImageLayout(int width, int height, int pixelType,
- int pixelSize) {
+ int pixelSize)
+ throws ImageLayoutException
+ {
this.pixelType = pixelType;
this.width = width;
this.height = height;
- nextRowOffset = width*pixelSize;
+ nextRowOffset = safeMult(pixelSize, width);
offset = 0;
}
- public LCMSImageLayout(byte[] data, int np, int pixelType, int pixelSize) {
+ public LCMSImageLayout(byte[] data, int np, int pixelType, int pixelSize)
+ throws ImageLayoutException
+ {
this(np, pixelType, pixelSize);
dataType = DT_BYTE;
dataArray = data;
+ dataArrayLength = data.length;
+
+ verify();
}
- public LCMSImageLayout(short[] data, int np, int pixelType, int pixelSize) {
+ public LCMSImageLayout(short[] data, int np, int pixelType, int pixelSize)
+ throws ImageLayoutException
+ {
this(np, pixelType, pixelSize);
dataType = DT_SHORT;
dataArray = data;
+ dataArrayLength = 2 * data.length;
+
+ verify();
}
- public LCMSImageLayout(int[] data, int np, int pixelType, int pixelSize) {
+ public LCMSImageLayout(int[] data, int np, int pixelType, int pixelSize)
+ throws ImageLayoutException
+ {
this(np, pixelType, pixelSize);
dataType = DT_INT;
dataArray = data;
+ dataArrayLength = 4 * data.length;
+
+ verify();
}
public LCMSImageLayout(double[] data, int np, int pixelType, int pixelSize)
+ throws ImageLayoutException
{
this(np, pixelType, pixelSize);
dataType = DT_DOUBLE;
dataArray = data;
+ dataArrayLength = 8 * data.length;
+
+ verify();
}
- public LCMSImageLayout(BufferedImage image) {
+ public LCMSImageLayout(BufferedImage image) throws ImageLayoutException {
ShortComponentRaster shortRaster;
IntegerComponentRaster intRaster;
ByteComponentRaster byteRaster;
@@ -186,9 +211,13 @@
case BufferedImage.TYPE_INT_ARGB:
case BufferedImage.TYPE_INT_BGR:
intRaster = (IntegerComponentRaster)image.getRaster();
- nextRowOffset = intRaster.getScanlineStride()*4;
- offset = intRaster.getDataOffset(0)*4;
+
+ nextRowOffset = safeMult(4, intRaster.getScanlineStride());
+
+ offset = safeMult(4, intRaster.getDataOffset(0));
+
dataArray = intRaster.getDataStorage();
+ dataArrayLength = 4 * intRaster.getDataStorage().length;
dataType = DT_INT;
break;
@@ -196,8 +225,10 @@
case BufferedImage.TYPE_4BYTE_ABGR:
byteRaster = (ByteComponentRaster)image.getRaster();
nextRowOffset = byteRaster.getScanlineStride();
- offset = byteRaster.getDataOffset(0);
+ int firstBand = image.getSampleModel().getNumBands() - 1;
+ offset = byteRaster.getDataOffset(firstBand);
dataArray = byteRaster.getDataStorage();
+ dataArrayLength = byteRaster.getDataStorage().length;
dataType = DT_BYTE;
break;
@@ -206,17 +237,20 @@
nextRowOffset = byteRaster.getScanlineStride();
offset = byteRaster.getDataOffset(0);
dataArray = byteRaster.getDataStorage();
+ dataArrayLength = byteRaster.getDataStorage().length;
dataType = DT_BYTE;
break;
case BufferedImage.TYPE_USHORT_GRAY:
shortRaster = (ShortComponentRaster)image.getRaster();
- nextRowOffset = shortRaster.getScanlineStride()*2;
- offset = shortRaster.getDataOffset(0) * 2;
+ nextRowOffset = safeMult(2, shortRaster.getScanlineStride());
+ offset = safeMult(2, shortRaster.getDataOffset(0));
dataArray = shortRaster.getDataStorage();
+ dataArrayLength = 2 * shortRaster.getDataStorage().length;
dataType = DT_SHORT;
break;
}
+ verify();
}
public static boolean isSupported(BufferedImage image) {
@@ -232,4 +266,45 @@
}
return false;
}
+
+ private void verify() throws ImageLayoutException {
+
+ if (offset < 0 || offset >= dataArrayLength) {
+ throw new ImageLayoutException("Invalid image layout");
+ }
+
+ int lastPixelOffset = safeMult(nextRowOffset, (height - 1));
+
+ lastPixelOffset = safeAdd(lastPixelOffset, (width - 1));
+
+ int off = safeAdd(offset, lastPixelOffset);
+
+ if (off < 0 || off >= dataArrayLength) {
+ throw new ImageLayoutException("Invalid image layout");
+ }
+ }
+
+ static int safeAdd(int a, int b) throws ImageLayoutException {
+ long res = a;
+ res += b;
+ if (res < Integer.MIN_VALUE || res > Integer.MAX_VALUE) {
+ throw new ImageLayoutException("Invalid image layout");
+ }
+ return (int)res;
+ }
+
+ static int safeMult(int a, int b) throws ImageLayoutException {
+ long res = a;
+ res *= b;
+ if (res < Integer.MIN_VALUE || res > Integer.MAX_VALUE) {
+ throw new ImageLayoutException("Invalid image layout");
+ }
+ return (int)res;
+ }
+
+ public static class ImageLayoutException extends Exception {
+ public ImageLayoutException(String message) {
+ super(message);
+ }
+ }
}
diff -r 2230cd11d9a5 -r 3d0b72d4c0f9 src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
--- a/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java Thu Feb 07 09:41:47 2013 -0800
+++ b/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java Thu Feb 21 11:25:43 2013 +0400
@@ -51,6 +51,7 @@
import java.awt.image.ComponentSampleModel;
import sun.java2d.cmm.*;
import sun.java2d.cmm.lcms.*;
+import static sun.java2d.cmm.lcms.LCMSImageLayout.ImageLayoutException;
public class LCMSTransform implements ColorTransform {
@@ -157,8 +158,12 @@
if (LCMSImageLayout.isSupported(src) &&
LCMSImageLayout.isSupported(dst))
{
- doTransform(new LCMSImageLayout(src), new LCMSImageLayout(dst));
- return;
+ try {
+ doTransform(new LCMSImageLayout(src), new LCMSImageLayout(dst));
+ return;
+ } catch (ImageLayoutException e) {
+ throw new CMMException("Unable to convert images");
+ }
}
LCMSImageLayout srcIL, dstIL;
Raster srcRas = src.getRaster();
@@ -216,14 +221,18 @@
}
int idx;
// TODO check for src npixels = dst npixels
- srcIL = new LCMSImageLayout(
- srcLine, srcLine.length/getNumInComponents(),
- LCMSImageLayout.CHANNELS_SH(getNumInComponents()) |
- LCMSImageLayout.BYTES_SH(1), getNumInComponents());
- dstIL = new LCMSImageLayout(
- dstLine, dstLine.length/getNumOutComponents(),
- LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) |
- LCMSImageLayout.BYTES_SH(1), getNumOutComponents());
+ try {
+ srcIL = new LCMSImageLayout(
+ srcLine, srcLine.length/getNumInComponents(),
+ LCMSImageLayout.CHANNELS_SH(getNumInComponents()) |
+ LCMSImageLayout.BYTES_SH(1), getNumInComponents());
+ dstIL = new LCMSImageLayout(
+ dstLine, dstLine.length/getNumOutComponents(),
+ LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) |
+ LCMSImageLayout.BYTES_SH(1), getNumOutComponents());
+ } catch (ImageLayoutException e) {
+ throw new CMMException("Unable to convert images");
+ }
// process each scanline
for (int y = 0; y < h; y++) {
// convert src scanline
@@ -272,16 +281,19 @@
alpha = new float[w];
}
int idx;
- srcIL = new LCMSImageLayout(
- srcLine, srcLine.length/getNumInComponents(),
- LCMSImageLayout.CHANNELS_SH(getNumInComponents()) |
- LCMSImageLayout.BYTES_SH(2), getNumInComponents()*2);
+ try {
More information about the distro-pkg-dev
mailing list