Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 12:05:29 -04:00
Code Issues Projects Releases Wiki Activity

Fix ArrayIndexOutOfBoundsException in CCITTFaxDecoderStream.decode2D #159

Browse Source
This commit is contained in:
Schmidor 2015-08-13 23:27:46 +02:00
parent 6ef5a5a7ee
commit 60e3d6e5af
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
View File

@ -154,13 +154,6 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
changesCurrentRow = changesReferenceRow; changesCurrentRow = changesReferenceRow;
changesReferenceRow = tmp; changesReferenceRow = tmp;
if (changesReferenceRowCount == 0) {
changesReferenceRowCount = 3;
changesReferenceRow[0] = columns;
changesReferenceRow[1] = columns;
changesReferenceRow[2] = columns;
}
boolean white = true; boolean white = true;
int index = 0; int index = 0;
changesCurrentRowCount = 0; changesCurrentRowCount = 0;
@ -179,23 +172,34 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
switch (n.value) { switch (n.value) {
case VALUE_HMODE: case VALUE_HMODE:
int runLength; int runLength;
runLength = decodeRun(white ? whiteRunTree : blackRunTree); runLength = decodeRun(white ? whiteRunTree : blackRunTree);
System.out.print(runLength + (white? "W" : "B"));
index += runLength; index += runLength;
changesCurrentRow[changesCurrentRowCount++] = index; changesCurrentRow[changesCurrentRowCount++] = index;
runLength = decodeRun(white ? blackRunTree : whiteRunTree); runLength = decodeRun(white ? blackRunTree : whiteRunTree);
System.out.print(runLength + (!white? "W" : "B") + ",");
index += runLength; index += runLength;
changesCurrentRow[changesCurrentRowCount++] = index; changesCurrentRow[changesCurrentRowCount++] = index;
break; break;
case VALUE_PASSMODE: case VALUE_PASSMODE:
index = changesReferenceRow[getNextChangingElement(index, white) + 1]; int pChangingElement = getNextChangingElement(index, white) + 1;
if(pChangingElement >= changesReferenceRowCount || pChangingElement == -1){
index = columns;
}else{
index = changesReferenceRow[pChangingElement];
}
break; break;
default: default:
// Vertical mode (-3 to 3) // Vertical mode (-3 to 3)
index = changesReferenceRow[getNextChangingElement(index, white)] + n.value; int vChangingElement = getNextChangingElement(index, white);
if(vChangingElement >= changesReferenceRowCount || vChangingElement == -1){
index = columns + n.value;
}else{
index = changesReferenceRow[vChangingElement]+ n.value;
}
changesCurrentRow[changesCurrentRowCount] = index; changesCurrentRow[changesCurrentRowCount] = index;
changesCurrentRowCount++; changesCurrentRowCount++;
white = !white; white = !white;
@ -212,12 +216,12 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
int start = white ? 0 : 1; int start = white ? 0 : 1;
for (int i = start; i < changesReferenceRowCount; i += 2) { for (int i = start; i < changesReferenceRowCount; i += 2) {
if (a0 < changesReferenceRow[i]) { if (a0 < changesReferenceRow[i] || (a0 == 0 && changesReferenceRow[i] == 0)) {
return i; return i;
} }
} }
return 0; return -1;
} }
private void decodeRowType2() throws IOException { private void decodeRowType2() throws IOException {
@ -271,6 +275,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
int index = 0; int index = 0;
boolean white = true; boolean white = true;
for (int i = 0; i <= changesCurrentRowCount; i++) { for (int i = 0; i <= changesCurrentRowCount; i++) {
int nextChange = columns; int nextChange = columns;
@ -311,7 +316,7 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
white = !white; white = !white;
} }
if (index != columns) { if (index != columns) {
throw new IOException("Sum of run-lengths does not equal scan line width: " + index + " > " + columns); throw new IOException("Sum of run-lengths does not equal scan line width: " + index + " > " + columns);
} }