From 0997f5199aee8d10330767a8a22f0c7f90a3ad6c Mon Sep 17 00:00:00 2001 From: Oliver Schmidtmer Date: Thu, 28 Jan 2016 20:12:11 +0100 Subject: [PATCH] catch EOF at reading the next-IFD pointer as EOF marker --- .../twelvemonkeys/imageio/metadata/exif/EXIFReader.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java index 284e45f0..d7ed8ccf 100644 --- a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java +++ b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java @@ -119,7 +119,13 @@ public final class EXIFReader extends MetadataReader { if (readLinked) { 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