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

#477: Better tests to for cyclic loops in IFDs.

Browse Source
This commit is contained in:
Harald Kuhr 2019-08-09 19:32:52 +02:00
parent 64178bd636
commit b0b5de5fa4
2 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,7 @@ public final class TIFFReader extends MetadataReader {
}
private IFD readIFD(final ImageInputStream pInput, final long pOffset, Collection<Integer> subIFDIds) throws IOException {
// TODO: Issue warning if IFD offset is not on word boundary (pOffset % 2 != 0)
pInput.seek(pOffset);
long entryCount = readEntryCount(pInput);

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

@ -35,6 +35,7 @@ import com.twelvemonkeys.imageio.metadata.Directory;
import com.twelvemonkeys.imageio.metadata.Entry;
import com.twelvemonkeys.imageio.metadata.MetadataReaderAbstractTest;
import com.twelvemonkeys.imageio.metadata.exif.EXIF;
import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
import com.twelvemonkeys.imageio.stream.SubImageInputStream;
import org.junit.Test;
@ -345,8 +346,11 @@ public class TIFFReaderTest extends MetadataReaderAbstractTest {
}
}
@Test(timeout = 500)
@Test(timeout = 200)
public void testReadCyclicExifWithoutLoopOrOOME() throws IOException {
// This EXIF segment has an interesting bug...
// The bits per sample value (0x 0008 0008 0008) overwrites half the IFD1 link offset (should be 0x00000000),
// effectively making it a loop back to the IFD0 at offset 0x0000008...
try (ImageInputStream stream = ImageIO.createImageInputStream(getResource("/exif/exif-loop.bin"))) {
CompoundDirectory directory = (CompoundDirectory) createReader().read(stream);
assertEquals(1, directory.directoryCount());
@ -355,4 +359,100 @@ public class TIFFReaderTest extends MetadataReaderAbstractTest {
assertEquals("2019:02:27 09:22:59", directory.getDirectory(0).getEntryById(TIFF.TAG_DATE_TIME).getValueAsString());
}
}
@Test(timeout = 100)
public void testIFDLoop() throws IOException {
byte[] looping = new byte[] {
'M', 'M', 0, 42,
0, 0, 0, 8, // IFD0 pointer
0, 1, // entry count
0, (byte) 259, // compression
0, 3, // SHORT
0, 0, 0, 1, // count
0, 0, 0, 0, //
0, 0, 0, 8, // IFD1 pointer
};
try (ImageInputStream stream = new ByteArrayImageInputStream(looping)) {
CompoundDirectory directory = (CompoundDirectory) createReader().read(stream);
assertEquals(1, directory.directoryCount());
assertEquals(1, directory.size());
}
}
@Test(timeout = 100)
public void testIFDLoopNested() throws IOException {
byte[] looping = new byte[] {
'M', 'M', 0, 42,
0, 0, 0, 8, // IFD0 pointer
0, 1, // entry count
1, 74, // sub IFD
0, 4, // LONG
0, 0, 0, 1, // count
0, 0, 0, 8, // sub IFD pointer -> IFD0
0, 0, 0, 0, // End of IFD chain
};
try (ImageInputStream stream = new ByteArrayImageInputStream(looping)) {
CompoundDirectory directory = (CompoundDirectory) createReader().read(stream);
assertEquals(1, directory.directoryCount());
assertEquals(1, directory.size());
}
}
@Test(timeout = 100)
public void testSubIFDLoop() throws IOException {
byte[] looping = new byte[] {
'M', 'M', 0, 42,
0, 0, 0, 8, // IFD0 pointer
0, 1, // entry count
1, 74, // sub IFD
0, 4, // LONG
0, 0, 0, 1, // count
0, 0, 0, 26, // SubIFD pointer
0, 0, 0, 0, // End of IFD chain
// --- sub IFD
0, 1, // entry count
1, 74, // sub IFD
0, 4, // LONG
0, 0, 0, 1, // count
0, 0, 0, 26, // sub IFD pointer -> sub IFD
};
try (ImageInputStream stream = new ByteArrayImageInputStream(looping)) {
CompoundDirectory directory = (CompoundDirectory) createReader().read(stream);
assertEquals(1, directory.directoryCount());
assertEquals(1, directory.size());
}
}
@Test(timeout = 100)
public void testSubIFDLoopNested() throws IOException {
byte[] looping = new byte[] {
'M', 'M', 0, 42,
0, 0, 0, 8, // IFD0 pointer
0, 1, // entry count
1, 74, // sub IFD
0, 4, // LONG
0, 0, 0, 1, // count
0, 0, 0, 26, // SubIFD pointer
0, 0, 0, 0, // End of IFD chain
// --- sub IFD
0, 1, // entry count
1, 74, // sub IFD
0, 4, // LONG
0, 0, 0, 1, // count
0, 0, 0, 8, // sub IFD pointer -> IFD0
};
try (ImageInputStream stream = new ByteArrayImageInputStream(looping)) {
CompoundDirectory directory = (CompoundDirectory) createReader().read(stream);
assertEquals(1, directory.directoryCount());
assertEquals(1, directory.size());
}
}
}