An invalid IFD pointer caused creating an empty IFD Directory

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFReader.java

@@ -135,7 +135,10 @@ public final class TIFFReader extends MetadataReader {
                 CompoundDirectory next = (CompoundDirectory) readDirectory(pInput, nextOffset, true);
 
                 for (int i = 0; i < next.directoryCount(); i++) {
-                    ifds.add((IFD) next.getDirectory(i));
+                    if(next.getDirectory(i).size() > 0) {
+                        // Linked directories might be empty if nextOffset is after EOF, so skip them
+                        ifds.add((IFD) next.getDirectory(i));
+                    }
                 }
             }
         }

imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFReaderTest.java

@@ -311,4 +311,13 @@ public class TIFFReaderTest extends MetadataReaderAbstractTest {
             assertTrue(directory.getEntryById(32934).getValue() instanceof EOFException);
         }
     }
+
+    @Test
+    public void testReadIDFPointerBeyondEOF() throws IOException {
+        try (ImageInputStream stream = ImageIO.createImageInputStream(getResource("/tiff/ifd-end-pointer.tif"))) {
+            CompoundDirectory directory = (CompoundDirectory) createReader().read(stream);
+            assertEquals(1, directory.directoryCount());
+            assertEquals(15, directory.size());
+        }
+    }
 }