Merge pull request #2482 from SixLabors/js/jpeg_JFXX

Allow JFXX as an App0 marker header
SixLabors · Jul 6, 2023 · b2ac9bb · b2ac9bb
2 parents c68be04 + 9f0fba4
commit b2ac9bb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
@@ -71,7 +71,9 @@ private JFifMarker(byte majorVersion, byte minorVersion, byte densityUnits, shor
     /// <param name="marker">The marker to return.</param>
     public static bool TryParse(ReadOnlySpan<byte> bytes, out JFifMarker marker)
     {
-        if (ProfileResolver.IsProfile(bytes, ProfileResolver.JFifMarker))
+        // Some images incorrectly use JFXX as the App0 marker (Issue 2478)
+        if (ProfileResolver.IsProfile(bytes, ProfileResolver.JFifMarker)
+            || ProfileResolver.IsProfile(bytes, ProfileResolver.JFxxMarker))
         {
             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
@@ -16,6 +16,14 @@ internal static class ProfileResolver
         (byte)'J', (byte)'F', (byte)'I', (byte)'F', (byte)'\0'
     };
 
+    /// <summary>
+    /// Gets the JFXX specific markers.
+    /// </summary>
+    public static ReadOnlySpan<byte> JFxxMarker => new[]
+    {
+        (byte)'J', (byte)'F', (byte)'X', (byte)'X', (byte)'\0'
+    };
+
     /// <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
@@ -314,4 +314,15 @@ public void Issue2315_DecodeWorks<TPixel>(TestImageProvider<TPixel> provider)
         image.DebugSave(provider);
         image.CompareToOriginal(provider);
     }
+
+    // https://github.com/SixLabors/ImageSharp/issues/2478
+    [Theory]
+    [WithFile(TestImages.Jpeg.Issues.Issue2478_JFXX, PixelTypes.Rgba32)]
+    public void Issue2478_DecodeWorks<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        using Image<TPixel> image = provider.GetImage(JpegDecoder.Instance);
+        image.DebugSave(provider);
+        image.CompareToOriginal(provider);
+    }
 }
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -290,6 +290,7 @@ public static class Issues
             public const string Issue2315_NotEnoughBytes = "Jpg/issues/issue-2315.jpg";
             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 static class Fuzz
             {

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