Merge pull request #681 from adam-vessey/fix/wrapped-reads

Fix/wrapped reads
cantaloupe-project · Aug 14, 2024 · b7acf8b · b7acf8b
2 parents dc7947a + 73119cd
commit b7acf8b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 33 deletions.
diff --git a/src/main/java/edu/illinois/library/cantaloupe/image/exif/Reader.java b/src/main/java/edu/illinois/library/cantaloupe/image/exif/Reader.java
@@ -155,10 +155,7 @@ private Directory read(TagSet tagSet) throws IOException {
 
     private byte[] readBytes(int length) throws IOException {
         byte[] data = new byte[length];
-        int n, offset = 0;
-        while ((n = inputStream.read(data, offset, data.length - offset)) < offset) {
-            offset += n;
-        }
+        inputStream.readFully(data);
         return data;
     }
 

diff --git a/src/main/java/edu/illinois/library/cantaloupe/processor/codec/gif/GIFMetadataReader.java b/src/main/java/edu/illinois/library/cantaloupe/processor/codec/gif/GIFMetadataReader.java
@@ -340,11 +340,7 @@ private void readPlainTextExtension() throws IOException {
 
     private byte[] read(int length) throws IOException {
         byte[] data = new byte[length];
-        int n, offset = 0;
-        while ((n = inputStream.read(
-                data, offset, data.length - offset)) < offset) {
-            offset += n;
-        }
+        inputStream.readFully(data);
         return data;
     }
 

diff --git a/src/main/java/edu/illinois/library/cantaloupe/processor/codec/jpeg/JPEGMetadataReader.java b/src/main/java/edu/illinois/library/cantaloupe/processor/codec/jpeg/JPEGMetadataReader.java
@@ -296,11 +296,7 @@ private void readAPP14Segment() throws IOException {
 
     private byte[] read(int length) throws IOException {
         byte[] data = new byte[length];
-        int n, offset = 0;
-        while ((n = inputStream.read(
-                data, offset, data.length - offset)) < offset) {
-            offset += n;
-        }
+        inputStream.readFully(data);
         return data;
     }
 

diff --git a/...java/edu/illinois/library/cantaloupe/processor/codec/jpeg2000/JPEG2000MetadataReader.java b/...java/edu/illinois/library/cantaloupe/processor/codec/jpeg2000/JPEG2000MetadataReader.java
@@ -8,6 +8,7 @@
 
 import javax.imageio.stream.ImageInputStream;
 import javax.xml.bind.DatatypeConverter;
+import java.io.EOFException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -268,23 +269,29 @@ private void readData() throws IOException {
             throw new IllegalStateException("Source not set");
         }
 
-        inputStream.mark();
-        byte[] bytes = read(JP2_SIGNATURE.length);
-        if (!Arrays.equals(JP2_SIGNATURE, bytes)) {
-            String hexStr = DatatypeConverter.printHexBinary(bytes);
-            throw new SourceFormatException("Invalid signature: " + hexStr +
-                    " (is this a JP2?)");
-        }
-        inputStream.reset();
+        try {
+          inputStream.mark();
+          byte[] bytes = read(JP2_SIGNATURE.length);
+          if (!Arrays.equals(JP2_SIGNATURE, bytes)) {
+              String hexStr = DatatypeConverter.printHexBinary(bytes);
+              throw new SourceFormatException("Invalid signature: " + hexStr +
+                      " (is this a JP2?)");
+          }
+          inputStream.reset();
 
-        final Stopwatch watch = new Stopwatch();
 
-        while (readBox() != -1) {
-            // Read boxes.
-            isReadAttempted = true;
-        }
+          final Stopwatch watch = new Stopwatch();
+
+          while (readBox() != -1) {
+              // Read boxes.
+              isReadAttempted = true;
+          }
 
-        LOGGER.debug("Read in {}: {}", watch, this);
+          LOGGER.debug("Read in {}: {}", watch, this);
+        }
+        catch (EOFException e) {
+          throw (SourceFormatException)(new SourceFormatException("JP2 appears to be corrupt; encountered EOF.").initCause(e));
+        }
     }
 
     private int readBox() throws IOException {
@@ -434,11 +441,7 @@ private void readCOCSegment() throws IOException {
 
     private byte[] read(int length) throws IOException {
         byte[] data = new byte[length];
-        int n, offset = 0;
-        while ((n = inputStream.read(
-                data, offset, data.length - offset)) < offset) {
-            offset += n;
-        }
+        inputStream.readFully(data);
         return data;
     }