From b28f43fa8409e1648c4e727d096948d2ef5c3f22 Mon Sep 17 00:00:00 2001
From: Milan Nikl <milan.nikl@firma.seznam.cz>
Date: Wed, 28 Apr 2021 13:39:24 +0200
Subject: [PATCH 1/4] Comparing PNG chunk size to available bytes in buffer

---
 Source/com/drew/imaging/png/PngChunkReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/com/drew/imaging/png/PngChunkReader.java b/Source/com/drew/imaging/png/PngChunkReader.java
index cbc4e5de5..69a4d54bb 100644
--- a/Source/com/drew/imaging/png/PngChunkReader.java
+++ b/Source/com/drew/imaging/png/PngChunkReader.java
@@ -86,7 +86,7 @@ public Iterable<PngChunk> extract(@NotNull final SequentialReader reader, @Nulla
             // Process the next chunk.
             int chunkDataLength = reader.getInt32();
 
-            if (chunkDataLength < 0)
+            if ((chunkDataLength < 0) || (chunkDataLength > reader.available()))
                 throw new PngProcessingException("PNG chunk length exceeds maximum");
 
             PngChunkType chunkType = new PngChunkType(reader.getBytes(4));

From e116370feae466cd42f5d93ba775121868a12f58 Mon Sep 17 00:00:00 2001
From: Milan Nikl <milan.nikl@firma.seznam.cz>
Date: Mon, 3 May 2021 11:23:38 +0200
Subject: [PATCH 2/4] Only copying chunk data for specified chunk types

- Reverted stream available bytes check
- Updated tests using corrupted png file
---
 .../com/drew/imaging/png/PngChunkReader.java  |  16 +++++++++--
 Tests/Data/icon-96x96-corrupted-data.png      | Bin 0 -> 8556 bytes
 .../drew/imaging/png/PngChunkReaderTest.java  |  25 ++++++++++++++++--
 .../imaging/png/PngMetadataReaderTest.java    |   6 +++++
 4 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 Tests/Data/icon-96x96-corrupted-data.png

diff --git a/Source/com/drew/imaging/png/PngChunkReader.java b/Source/com/drew/imaging/png/PngChunkReader.java
index 69a4d54bb..c8a4db064 100644
--- a/Source/com/drew/imaging/png/PngChunkReader.java
+++ b/Source/com/drew/imaging/png/PngChunkReader.java
@@ -69,6 +69,12 @@ public Iterable<PngChunk> extract(@NotNull final SequentialReader reader, @Nulla
         //     Miscellaneous information: bKGD, hIST, pHYs, sPLT
         //     Time information:          tIME
         //
+        // CHUNK READING
+        //
+        // Only chunk data for types specified in desiredChunkTypes is extracted.
+        // For empty chunk type list NO data is copied from source stream.
+        // For null chunk type list ALL data is copied from source stream.
+        //
 
         reader.setMotorolaByteOrder(true); // network byte order
 
@@ -86,14 +92,20 @@ public Iterable<PngChunk> extract(@NotNull final SequentialReader reader, @Nulla
             // Process the next chunk.
             int chunkDataLength = reader.getInt32();
 
-            if ((chunkDataLength < 0) || (chunkDataLength > reader.available()))
+            if (chunkDataLength < 0)
                 throw new PngProcessingException("PNG chunk length exceeds maximum");
 
             PngChunkType chunkType = new PngChunkType(reader.getBytes(4));
 
             boolean willStoreChunk = desiredChunkTypes == null || desiredChunkTypes.contains(chunkType);
 
-            byte[] chunkData = reader.getBytes(chunkDataLength);
+            byte[] chunkData;
+            if (willStoreChunk) {
+                chunkData = reader.getBytes(chunkDataLength);
+            } else {
+                chunkData = null; // To satisfy the compiler
+                reader.skip(chunkDataLength);
+            }
 
             // Skip the CRC bytes at the end of the chunk
             // TODO consider verifying the CRC value to determine if we're processing bad data
diff --git a/Tests/Data/icon-96x96-corrupted-data.png b/Tests/Data/icon-96x96-corrupted-data.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a180626a60a46da1a420eb8394d06b97caf0dc
GIT binary patch
literal 8556
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

literal 0
HcmV?d00001

diff --git a/Tests/com/drew/imaging/png/PngChunkReaderTest.java b/Tests/com/drew/imaging/png/PngChunkReaderTest.java
index 89ae249bd..510df5863 100644
--- a/Tests/com/drew/imaging/png/PngChunkReaderTest.java
+++ b/Tests/com/drew/imaging/png/PngChunkReaderTest.java
@@ -22,6 +22,10 @@
 
 import com.drew.lang.Iterables;
 import com.drew.lang.StreamReader;
+import java.io.EOFException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import org.junit.Test;
 
 import java.io.FileInputStream;
@@ -35,12 +39,20 @@
  */
 public class PngChunkReaderTest
 {
-    public static List<PngChunk> processFile(String filePath) throws PngProcessingException, IOException
+
+    public static List<PngChunk> processFile(String filePath)
+        throws PngProcessingException, IOException {
+        return processFile(filePath, null);
+    }
+
+    public static List<PngChunk> processFile(String filePath, Set<PngChunkType> desiredChunkTypes)
+        throws PngProcessingException, IOException
     {
         FileInputStream inputStream = null;
         try {
             inputStream = new FileInputStream(filePath);
-            return Iterables.toList(new PngChunkReader().extract(new StreamReader(inputStream), null));
+            return Iterables.toList(new PngChunkReader().extract(new StreamReader(inputStream),
+                desiredChunkTypes));
         } finally {
             if (inputStream != null) {
                 inputStream.close();
@@ -96,4 +108,13 @@ public void testExtractPhotoshop() throws Exception
         assertEquals(PngChunkType.IEND, chunks.get(4).getType());
         assertEquals(0, chunks.get(4).getBytes().length);
     }
+
+    @Test(expected = EOFException.class)
+    public void testCorruptedFile() throws Exception
+    {
+        // One desired chunk specified, only given chunk read, other types skipped.
+        Set<PngChunkType> desiredChunkTypes = new HashSet<>();
+        desiredChunkTypes.add(PngChunkType.IHDR);
+        processFile("Tests/Data/icon-96x96-corrupted-data.png", desiredChunkTypes);
+    }
 }
diff --git a/Tests/com/drew/imaging/png/PngMetadataReaderTest.java b/Tests/com/drew/imaging/png/PngMetadataReaderTest.java
index a32f6e469..7d07a6792 100644
--- a/Tests/com/drew/imaging/png/PngMetadataReaderTest.java
+++ b/Tests/com/drew/imaging/png/PngMetadataReaderTest.java
@@ -24,6 +24,7 @@
 import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.png.PngDirectory;
+import java.io.EOFException;
 import org.junit.Test;
 
 import java.io.FileInputStream;
@@ -114,4 +115,9 @@ public void testGimpGreyscaleWithManyChunks() throws Exception
             TimeZone.setDefault(timeZone);
         }
     }
+
+    @Test(expected = EOFException.class)
+    public void corruptedFileTest() throws PngProcessingException, IOException {
+        processFile("Tests/Data/icon-96x96-corrupted-data.png");
+    }
 }

From c588b9568cb75313f7005b4f32ecb51672ae1f29 Mon Sep 17 00:00:00 2001
From: Milan Nikl <milan.nikl@firma.seznam.cz>
Date: Mon, 3 May 2021 11:42:57 +0200
Subject: [PATCH 3/4] Fixing diamond operator for Java 1.6 compatibility

---
 Tests/com/drew/imaging/png/PngChunkReaderTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/com/drew/imaging/png/PngChunkReaderTest.java b/Tests/com/drew/imaging/png/PngChunkReaderTest.java
index 510df5863..e64a7a4df 100644
--- a/Tests/com/drew/imaging/png/PngChunkReaderTest.java
+++ b/Tests/com/drew/imaging/png/PngChunkReaderTest.java
@@ -113,7 +113,7 @@ public void testExtractPhotoshop() throws Exception
     public void testCorruptedFile() throws Exception
     {
         // One desired chunk specified, only given chunk read, other types skipped.
-        Set<PngChunkType> desiredChunkTypes = new HashSet<>();
+        Set<PngChunkType> desiredChunkTypes = new HashSet<PngChunkType>();
         desiredChunkTypes.add(PngChunkType.IHDR);
         processFile("Tests/Data/icon-96x96-corrupted-data.png", desiredChunkTypes);
     }

From 6247ec7f9487c54be66f3ba3a668a7302d8906f7 Mon Sep 17 00:00:00 2001
From: Milan Nikl <milan.nikl@firma.seznam.cz>
Date: Tue, 4 May 2021 08:06:51 +0200
Subject: [PATCH 4/4] Removed tests with corrupted image as it should be placed
 into image repository instead.

---
 Tests/Data/icon-96x96-corrupted-data.png      | Bin 8556 -> 0 bytes
 .../drew/imaging/png/PngChunkReaderTest.java  |  25 ++----------------
 .../imaging/png/PngMetadataReaderTest.java    |   6 -----
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 Tests/Data/icon-96x96-corrupted-data.png

diff --git a/Tests/Data/icon-96x96-corrupted-data.png b/Tests/Data/icon-96x96-corrupted-data.png
deleted file mode 100644
index 91a180626a60a46da1a420eb8394d06b97caf0dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8556
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

diff --git a/Tests/com/drew/imaging/png/PngChunkReaderTest.java b/Tests/com/drew/imaging/png/PngChunkReaderTest.java
index e64a7a4df..89ae249bd 100644
--- a/Tests/com/drew/imaging/png/PngChunkReaderTest.java
+++ b/Tests/com/drew/imaging/png/PngChunkReaderTest.java
@@ -22,10 +22,6 @@
 
 import com.drew.lang.Iterables;
 import com.drew.lang.StreamReader;
-import java.io.EOFException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 import org.junit.Test;
 
 import java.io.FileInputStream;
@@ -39,20 +35,12 @@
  */
 public class PngChunkReaderTest
 {
-
-    public static List<PngChunk> processFile(String filePath)
-        throws PngProcessingException, IOException {
-        return processFile(filePath, null);
-    }
-
-    public static List<PngChunk> processFile(String filePath, Set<PngChunkType> desiredChunkTypes)
-        throws PngProcessingException, IOException
+    public static List<PngChunk> processFile(String filePath) throws PngProcessingException, IOException
     {
         FileInputStream inputStream = null;
         try {
             inputStream = new FileInputStream(filePath);
-            return Iterables.toList(new PngChunkReader().extract(new StreamReader(inputStream),
-                desiredChunkTypes));
+            return Iterables.toList(new PngChunkReader().extract(new StreamReader(inputStream), null));
         } finally {
             if (inputStream != null) {
                 inputStream.close();
@@ -108,13 +96,4 @@ public void testExtractPhotoshop() throws Exception
         assertEquals(PngChunkType.IEND, chunks.get(4).getType());
         assertEquals(0, chunks.get(4).getBytes().length);
     }
-
-    @Test(expected = EOFException.class)
-    public void testCorruptedFile() throws Exception
-    {
-        // One desired chunk specified, only given chunk read, other types skipped.
-        Set<PngChunkType> desiredChunkTypes = new HashSet<PngChunkType>();
-        desiredChunkTypes.add(PngChunkType.IHDR);
-        processFile("Tests/Data/icon-96x96-corrupted-data.png", desiredChunkTypes);
-    }
 }
diff --git a/Tests/com/drew/imaging/png/PngMetadataReaderTest.java b/Tests/com/drew/imaging/png/PngMetadataReaderTest.java
index 7d07a6792..a32f6e469 100644
--- a/Tests/com/drew/imaging/png/PngMetadataReaderTest.java
+++ b/Tests/com/drew/imaging/png/PngMetadataReaderTest.java
@@ -24,7 +24,6 @@
 import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.png.PngDirectory;
-import java.io.EOFException;
 import org.junit.Test;
 
 import java.io.FileInputStream;
@@ -115,9 +114,4 @@ public void testGimpGreyscaleWithManyChunks() throws Exception
             TimeZone.setDefault(timeZone);
         }
     }
-
-    @Test(expected = EOFException.class)
-    public void corruptedFileTest() throws PngProcessingException, IOException {
-        processFile("Tests/Data/icon-96x96-corrupted-data.png");
-    }
 }