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

Fix reading bad SubIFDs again

Browse Source
This commit is contained in:
Oliver Schmidtmer 2016-02-16 22:52:57 +01:00
parent 672aa1a048
commit 6796910091
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java
View File

@ -105,16 +105,27 @@ public final class EXIFReader extends MetadataReader {
} }
for (int i = 0; i < entryCount; i++) { for (int i = 0; i < entryCount; i++) {
EXIFEntry entry = readEntry(pInput); try {
EXIFEntry entry = readEntry(pInput);
if (entry != null) { if (entry != null) {
entries.add(entry); entries.add(entry);
}
}
catch (IIOException e) {
break;
} }
} }
if (readLinked) { if (readLinked) {
if (nextOffset == -1) { if (nextOffset == -1) {
nextOffset = pInput.readUnsignedInt(); try {
nextOffset = pInput.readUnsignedInt();
}
catch (EOFException e) {
// catch EOF here as missing EOF marker
nextOffset = 0;
}
} }
// Read linked IFDs // Read linked IFDs