[fix]: Fixed Unknown App0 Marker add profileResolver missing

SixLabors · Oct 19, 2023 · c7f3aa4 · c7f3aa4
1 parent d93bc6c
commit c7f3aa4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
@@ -73,7 +73,8 @@ public static bool TryParse(ReadOnlySpan<byte> bytes, out JFifMarker marker)
     {
         // Some images incorrectly use JFXX as the App0 marker (Issue 2478)
         if (ProfileResolver.IsProfile(bytes, ProfileResolver.JFifMarker)
-            || ProfileResolver.IsProfile(bytes, ProfileResolver.JFxxMarker))
+            || ProfileResolver.IsProfile(bytes, ProfileResolver.JFxxMarker)
+            || ProfileResolver.IsProfile(bytes, ProfileResolver.OSQidMaker))
         {
             byte majorVersion = bytes[5];
             byte minorVersion = bytes[6];

diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
@@ -24,6 +24,14 @@ internal static class ProfileResolver
         (byte)'J', (byte)'F', (byte)'X', (byte)'X', (byte)'\0'
     };
 
+    /// <summary>
+    /// Gets the \n[ID or 10 91 73 68 32 specific markers.
+    /// </summary>
+    public static ReadOnlySpan<byte> OSQidMaker => new[]
+    {
+        (byte)'\n', (byte)'[', (byte)'I', (byte)'D', (byte)' '
+    };
+
     /// <summary>
     /// Gets the ICC specific markers.
     /// </summary>

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -326,6 +326,17 @@ public void Issue2478_DecodeWorks<TPixel>(TestImageProvider<TPixel> provider)
         image.CompareToOriginal(provider);
     }
 
+    // https://github.com/SixLabors/ImageSharp/discussions/2564
+    [Theory]
+    [WithFile(TestImages.Jpeg.Issues.Issue2564, PixelTypes.Rgba32)]
+    public void Issue2564_DecodeWorks<TPixel>(TestImageProvider<TPixel> provider)
+    where TPixel : unmanaged, IPixel<TPixel>
+    {
+        using Image<TPixel> image = provider.GetImage(JpegDecoder.Instance);
+        image.DebugSave(provider);
+        image.CompareToOriginal(provider);
+    }
+
     [Theory]
     [WithFile(TestImages.Jpeg.Issues.HangBadScan, PixelTypes.L8)]
     public void DecodeHang<TPixel>(TestImageProvider<TPixel> provider)

diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -291,6 +291,7 @@ public static class Issues
             public const string Issue2334_NotEnoughBytesA = "Jpg/issues/issue-2334-a.jpg";
             public const string Issue2334_NotEnoughBytesB = "Jpg/issues/issue-2334-b.jpg";
             public const string Issue2478_JFXX = "Jpg/issues/issue-2478-jfxx.jpg";
+            public const string Issue2564 = "Jpg/issues/issue-2564.jpg";
             public const string HangBadScan = "Jpg/issues/Hang_C438A851.jpg";
 
             public static class Fuzz

diff --git a/tests/Images/Input/Jpg/issues/issue-2564.jpg b/tests/Images/Input/Jpg/issues/issue-2564.jpg