stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8011248: Better Component Rasters

Browse Source 
Reviewed-by: bae, vadim, mschoene
This commit is contained in:
Phil Race 2013-04-08 13:29:19 -07:00
parent 60bb493c66
commit 6a20e4d507
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java
View File

@ -654,9 +654,6 @@ public class IntegerComponentRaster extends SunWritableRaster {
") must be >= 0"); ") must be >= 0");
} }
int maxSize = 0;
int size;
// we can be sure that width and height are greater than 0 // we can be sure that width and height are greater than 0
if (scanlineStride < 0 || if (scanlineStride < 0 ||
scanlineStride > (Integer.MAX_VALUE / height)) scanlineStride > (Integer.MAX_VALUE / height))
@ -682,21 +679,23 @@ public class IntegerComponentRaster extends SunWritableRaster {
} }
lastPixelOffset += lastScanOffset; lastPixelOffset += lastScanOffset;
int index;
int maxIndex = 0;
for (int i = 0; i < numDataElements; i++) { for (int i = 0; i < numDataElements; i++) {
if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) { if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
throw new RasterFormatException("Incorrect band offset: " throw new RasterFormatException("Incorrect band offset: "
+ dataOffsets[i]); + dataOffsets[i]);
} }
size = lastPixelOffset + dataOffsets[i]; index = lastPixelOffset + dataOffsets[i];
if (size > maxSize) { if (index > maxIndex) {
maxSize = size; maxIndex = index;
} }
} }
if (data.length < maxSize) { if (data.length <= maxIndex) {
throw new RasterFormatException("Data array too small (should be " throw new RasterFormatException("Data array too small (should be > "
+ maxSize + " )"); + maxIndex + " )");
} }
} }