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

#582: Fix for missing Exif thumbnail, now only issues warning.

Browse Source
This commit is contained in:
Harald Kuhr 2021-01-11 22:10:25 +01:00
parent ebaa69713f
commit de02e3d7e0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
View File

@ -1113,13 +1113,13 @@ public final class JPEGImageReader extends ImageReaderBase {
Application exif = exifSegments.get(0); Application exif = exifSegments.get(0);
// Identifier is "Exif\0" + 1 byte pad // Identifier is "Exif\0" + 1 byte pad
int offset = exif.identifier.length() + 2; int dataOffset = exif.identifier.length() + 2;
if (exif.data.length <= offset) { if (exif.data.length <= dataOffset) {
processWarningOccurred("Exif chunk has no data."); processWarningOccurred("Exif chunk has no data.");
} }
else { else {
ImageInputStream stream = new ByteArrayImageInputStream(exif.data, offset, exif.data.length - offset); ImageInputStream stream = new ByteArrayImageInputStream(exif.data, dataOffset, exif.data.length - dataOffset);
CompoundDirectory exifMetadata = (CompoundDirectory) new TIFFReader().read(stream); CompoundDirectory exifMetadata = (CompoundDirectory) new TIFFReader().read(stream);
if (exifMetadata.directoryCount() == 2) { if (exifMetadata.directoryCount() == 2) {
@ -1130,14 +1130,18 @@ public final class JPEGImageReader extends ImageReaderBase {
int compression = compressionEntry == null ? 6 : ((Number) compressionEntry.getValue()).intValue(); int compression = compressionEntry == null ? 6 : ((Number) compressionEntry.getValue()).intValue();
if (compression == 6) { if (compression == 6) {
if (ifd1.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT) != null) { Entry jpegOffEntry = ifd1.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT);
Entry jpegLength = ifd1.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); if (jpegOffEntry != null) {
Entry jpegLenEntry = ifd1.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
if ((jpegLength == null || ((Number) jpegLength.getValue()).longValue() > 0)) { // Test if Exif thumbnail is contained within the Exif segment (offset + length <= segment.length)
long jpegOffset = ((Number) jpegOffEntry.getValue()).longValue();
long jpegLength = jpegLenEntry != null ? ((Number) jpegLenEntry.getValue()).longValue() : -1;
if (jpegLength > 0 && jpegOffset + jpegLength <= stream.length()) {
thumbnails.add(new EXIFThumbnailReader(thumbnailProgressDelegator, getThumbnailReader(), 0, thumbnails.size(), ifd1, stream)); thumbnails.add(new EXIFThumbnailReader(thumbnailProgressDelegator, getThumbnailReader(), 0, thumbnails.size(), ifd1, stream));
} }
else { else {
processWarningOccurred("EXIF IFD with empty (zero-length) thumbnail"); processWarningOccurred("EXIF IFD with empty or incomplete JPEG thumbnail");
} }
} }
else { else {