Merge pull request #3022 from SixLabors/js/fix-2948

Explicitly handle missing SOS marker.

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -62,8 +62,6 @@ jobs:
     needs: WarmLFS
     strategy:
       matrix:
-        isARM:
-          - ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
         options:
           - os: ubuntu-latest
             framework: net9.0
@@ -121,10 +119,6 @@ jobs:
             sdk: 8.0.x
             runtime: -x64
             codecov: false
-        exclude:
-          - isARM: false
-            options:
-              os: buildjet-4vcpu-ubuntu-2204-arm
 
     runs-on: ${{ matrix.options.os }}
 

src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs

@@ -71,6 +71,11 @@ internal sealed class JpegDecoderCore : ImageDecoderCore, IRawJpegData
     /// </summary>
     private bool hasAdobeMarker;
 
+    /// <summary>
+    /// Whether the image has a SOS marker.
+    /// </summary>
+    private bool hasSOSMarker;
+
     /// <summary>
     /// Contains information about the JFIF marker.
     /// </summary>
@@ -197,6 +202,12 @@ protected override Image<TPixel> Decode<TPixel>(BufferedReadStream stream, Cance
     {
         using SpectralConverter<TPixel> spectralConverter = new(this.configuration, this.resizeMode == JpegDecoderResizeMode.ScaleOnly ? null : this.Options.TargetSize);
         this.ParseStream(stream, spectralConverter, cancellationToken);
+
+        if (!this.hasSOSMarker)
+        {
+            JpegThrowHelper.ThrowInvalidImageContentException("Missing SOS marker.");
+        }
+
         this.InitExifProfile();
         this.InitIccProfile();
         this.InitIptcProfile();
@@ -215,6 +226,12 @@ protected override Image<TPixel> Decode<TPixel>(BufferedReadStream stream, Cance
     protected override ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellationToken)
     {
         this.ParseStream(stream, spectralConverter: null, cancellationToken);
+
+        if (!this.hasSOSMarker)
+        {
+            JpegThrowHelper.ThrowInvalidImageContentException("Missing SOS marker.");
+        }
+
         this.InitExifProfile();
         this.InitIccProfile();
         this.InitIptcProfile();
@@ -403,6 +420,8 @@ internal void ParseStream(BufferedReadStream stream, SpectralConverter spectralC
                         break;
 
                     case JpegConstants.Markers.SOS:
+
+                        this.hasSOSMarker = true;
                         if (!metadataOnly)
                         {
                             this.ProcessStartOfScanMarker(stream, markerContentByteSize);

tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@@ -417,4 +417,20 @@ public void Decode_RGB_ICC_Jpeg<TPixel>(TestImageProvider<TPixel> provider)
         image.DebugSave(provider);
         image.CompareToReferenceOutput(provider);
     }
+
+    // https://github.com/SixLabors/ImageSharp/issues/2948
+    [Theory]
+    [WithFile(TestImages.Jpeg.Issues.Issue2948, PixelTypes.Rgb24)]
+    public void Issue2948_No_SOS_Decode_Throws_InvalidImageContentException<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel>
+        => Assert.Throws<InvalidImageContentException>(() =>
+        {
+            using Image<TPixel> image = provider.GetImage(JpegDecoder.Instance);
+        });
+
+    // https://github.com/SixLabors/ImageSharp/issues/2948
+    [Theory]
+    [InlineData(TestImages.Jpeg.Issues.Issue2948)]
+    public void Issue2948_No_SOS_Identify_Throws_InvalidImageContentException(string imagePath)
+        => Assert.Throws<InvalidImageContentException>(() => _ = Image.Identify(TestFile.Create(imagePath).Bytes));
 }

tests/ImageSharp.Tests/TestImages.cs

@@ -348,6 +348,7 @@ public static class Issues
             public const string Issue2638 = "Jpg/issues/Issue2638.jpg";
             public const string Issue2758 = "Jpg/issues/issue-2758.jpg";
             public const string Issue2857 = "Jpg/issues/issue-2857-subsub-ifds.jpg";
+            public const string Issue2948 = "Jpg/issues/issue-2948-sos.jpg";
 
             public static class Fuzz
             {