Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-01 00:00:02 -04:00
Code Issues Projects Releases Wiki Activity

TMI-105: Handle (ignore) empty JFIF segment without throwing EOFException.

Browse Source
This commit is contained in:
Harald Kuhr
2015-03-03 09:09:40 +01:00
parent 5b95f57066
commit d6f90b0b52
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
+15 -2
View File
@@ -560,11 +560,13 @@ public class JPEGImageReader extends ImageReaderBase {
switch (adobeDCT.getTransform()) {
case AdobeDCTSegment.YCC:
if (startOfFrame.components.length != 3) {
// This probably means the Adobe marker is bogus
break;
}
return JPEGColorSpace.YCbCr;
case AdobeDCTSegment.YCCK:
if (startOfFrame.components.length != 4) {
// This probably means the Adobe marker is bogus
break;
}
return JPEGColorSpace.YCCK;
@@ -789,7 +791,13 @@ public class JPEGImageReader extends ImageReaderBase {
if (!jfif.isEmpty()) {
JPEGSegment segment = jfif.get(0);
return JFIFSegment.read(segment.data());
if (segment.length() >= 9) {
return JFIFSegment.read(segment.data());
}
else {
processWarningOccurred("Bogus JFIF segment, ignoring");
}
}
return null;
@@ -800,7 +808,12 @@ public class JPEGImageReader extends ImageReaderBase {
if (!jfxx.isEmpty()) {
JPEGSegment segment = jfxx.get(0);
return JFXXSegment.read(segment.data(), segment.length());
if (segment.length() >= 1) {
return JFXXSegment.read(segment.data(), segment.length());
}
else {
processWarningOccurred("Bogus JFXX segment, ignoring");
}
}
return null;