#843: Correctly handle empty image resources section.

haraldk · Oct 20, 2023 · 9720a93 · 9720a93
1 parent 4d3f691
commit 9720a93
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java
@@ -864,21 +864,27 @@ private void readImageResources(final boolean pParseData) throws IOException {
 
             long imageResourcesLength = imageInput.readUnsignedInt();
 
-            if (pParseData && metadata.imageResources == null && imageResourcesLength > 0) {
-                long expectedEnd = imageInput.getStreamPosition() + imageResourcesLength;
-                metadata.imageResources = new ArrayList<>();
-
-                while (imageInput.getStreamPosition() < expectedEnd) {
-                    PSDImageResource resource = PSDImageResource.read(imageInput);
-                    metadata.imageResources.add(resource);
+            if (pParseData && metadata.imageResources == null) {
+                if (imageResourcesLength == 0) {
+                    metadata.imageResources = Collections.emptyList();
                 }
+                else {
+                    metadata.imageResources = new ArrayList<>();
 
-                if (DEBUG) {
-                    System.out.println("imageResources: " + metadata.imageResources);
-                }
+                    long expectedEnd = imageInput.getStreamPosition() + imageResourcesLength;
+
+                    while (imageInput.getStreamPosition() < expectedEnd) {
+                        PSDImageResource resource = PSDImageResource.read(imageInput);
+                        metadata.imageResources.add(resource);
+                    }
+
+                    if (DEBUG) {
+                        System.out.println("imageResources: " + metadata.imageResources);
+                    }
 
-                if (imageInput.getStreamPosition() != expectedEnd) {
-                    throw new IIOException("Corrupt PSD document"); // ..or maybe just a bug in the reader.. ;-)
+                    if (imageInput.getStreamPosition() != expectedEnd) {
+                        throw new IIOException("Corrupt PSD document"); // ..or maybe just a bug in the reader.. ;-)
+                    }
                 }
             }