From 9610256ddb46e0d847ee4d5095cc5ab59d0bebd7 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Tue, 19 Nov 2024 10:36:12 +0100
Subject: [PATCH]  #1058: JPEG fix ClassCastException for Unknown segments

---
 .../plugins/jpeg/JPEGImage10Metadata.java        |   3 ++-
 .../plugins/jpeg/JPEGImageReaderTest.java        |   3 ++-
 .../src/test/resources/jpeg/dnl-marker.jpg       | Bin 0 -> 4023 bytes
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 imageio/imageio-jpeg/src/test/resources/jpeg/dnl-marker.jpg

diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImage10Metadata.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImage10Metadata.java
index 56975a91..f85cb150 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImage10Metadata.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImage10Metadata.java
@@ -268,7 +268,8 @@ class JPEGImage10Metadata extends AbstractMetadata {
                 default:
                     IIOMetadataNode unknown = new IIOMetadataNode("unknown");
                     unknown.setAttribute("MarkerTag", String.valueOf(segment.marker & 0xFF));
-                    unknown.setUserObject(((Application) segment).data);
+                    byte[] data = segment instanceof Application ? ((Application) segment).data : ((Unknown) segment).data;
+                    unknown.setUserObject(data);
                     markerSequence.appendChild(unknown);
 
                     break;
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index ff8588be..b0dd0994 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -114,7 +114,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
                 new TestData(getClassLoaderResource("/jpeg-lossless/24_ls.jpg"), new Dimension(800, 535)), // Lossless RGB, 8 bit per component (24 bit)
                 new TestData(getClassLoaderResource("/jpeg-lossless/f-18.jpg"), new Dimension(320, 240)), // Lossless RGB, 3 DHTs
                 new TestData(getClassLoaderResource("/jpeg-lossless/testimg_rgb.jpg"), new Dimension(227, 149)), // Lossless RGB, 8 bit per component (24 bit)
-                new TestData(getClassLoaderResource("/jpeg-lossless/testimg_gray.jpg"), new Dimension(512, 512)) // Lossless gray, 16 bit
+                new TestData(getClassLoaderResource("/jpeg-lossless/testimg_gray.jpg"), new Dimension(512, 512)), // Lossless gray, 16 bit
+                new TestData(getClassLoaderResource("/jpeg/dnl-marker.jpg"), new Dimension(194, 132)) // Define Number of Lines marker
         );
 
         // More test data in specific tests below
diff --git a/imageio/imageio-jpeg/src/test/resources/jpeg/dnl-marker.jpg b/imageio/imageio-jpeg/src/test/resources/jpeg/dnl-marker.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5050d855a6ee5ef8763063b9e0f9d20aaba240f1
GIT binary patch
literal 4023
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

literal 0
HcmV?d00001