Merge pull request #1226 from SixLabors/js/issue-1211

Only throw for multi SOF when fully decoding.
SixLabors · Jun 12, 2020 · 0890bca · 0890bca
2 parents 2fbb450 + c163879
commit 0890bca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -812,6 +812,11 @@ private void ProcessStartOfFrameMarker(int remaining, in JpegFileMarker frameMar
         {
             if (this.Frame != null)
             {
+                if (metadataOnly)
+                {
+                    return;
+                }
+
                 JpegThrowHelper.ThrowInvalidImageContentException("Multiple SOF markers. Only single frame jpegs supported.");
             }
 

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
@@ -38,6 +38,7 @@ public partial class JpegDecoderTests
             { true, TestImages.Jpeg.Baseline.Jpeg400, 8, false, false },
             { true, TestImages.Jpeg.Baseline.Snake, 24, true, true },
             { true, TestImages.Jpeg.Baseline.Jpeg420Exif, 24, true, false },
+            { true, TestImages.Jpeg.Issues.IdentifyMultiFrame1211, 24, true, true },
         };
 
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =

diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -229,6 +229,7 @@ public static class Issues
                 public const string IncorrectResize1006 = "Jpg/issues/issue1006-incorrect-resize.jpg";
                 public const string ExifResize1049 = "Jpg/issues/issue1049-exif-resize.jpg";
                 public const string BadSubSampling1076 = "Jpg/issues/issue-1076-invalid-subsampling.jpg";
+                public const string IdentifyMultiFrame1211 = "Jpg/issues/issue-1221-identify-multi-frame.jpg";
 
                 public static class Fuzz
                 {

diff --git a/tests/Images/Input/Jpg/issues/issue-1221-identify-multi-frame.jpg b/tests/Images/Input/Jpg/issues/issue-1221-identify-multi-frame.jpg
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 if (this.Frame != null)
                 {
+                    if (metadataOnly)
+                    {
+                        return;
+                    }
                     JpegThrowHelper.ThrowInvalidImageContentException("Multiple SOF markers. Only single frame jpegs supported.");
                 }
@@ Expand Down @@