Merge pull request #2890 from SixLabors/af/backport-2859

Backport #2859 to release/2.1.x

Author: JimBobSquarePants

.gitattributes

@@ -115,6 +115,7 @@
 *.jpg               filter=lfs diff=lfs merge=lfs -text
 *.jpeg              filter=lfs diff=lfs merge=lfs -text
 *.bmp               filter=lfs diff=lfs merge=lfs -text
+*.BMP               filter=lfs diff=lfs merge=lfs -text
 *.gif               filter=lfs diff=lfs merge=lfs -text
 *.png               filter=lfs diff=lfs merge=lfs -text
 *.tif               filter=lfs diff=lfs merge=lfs -text

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

@@ -74,6 +74,16 @@ jobs:
     runs-on: ${{matrix.options.os}}
 
     steps:
+      - name: Install Ubuntu prerequisites
+        if: ${{ contains(matrix.options.os, 'ubuntu') }}
+        run: |
+          # libssl 1.1 (required by old .NET runtimes)
+          wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb
+          sudo dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb
+
+          # libgdiplus
+          sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
+
       - name: Git Config
         shell: bash
         run: |
@@ -151,7 +161,7 @@ jobs:
           XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
 
       - name: Export Failed Output
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip

src/ImageSharp/Formats/Gif/LzwDecoder.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.DotNet.RemoteExecutor;
-
+using Microsoft.DotNet.XUnitExtensions;
 using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;

tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs

@@ -317,5 +317,17 @@ public void IssueTooLargeLzwBits<TPixel>(TestImageProvider<TPixel> provider)
             image.DebugSaveMultiFrame(provider);
             image.CompareToReferenceOutputMultiFrame(provider, ImageComparer.Exact);
         }
+
+        // https://github.com/SixLabors/ImageSharp/issues/2859
+        [Theory]
+        [WithFile(TestImages.Gif.Issues.Issue2859_A, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Gif.Issues.Issue2859_B, PixelTypes.Rgba32)]
+        public void Issue2859_LZWPixelStackOverflow<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using Image<TPixel> image = provider.GetImage();
+            image.DebugSaveMultiFrame(provider);
+            image.CompareToReferenceOutputMultiFrame(provider, ImageComparer.Exact);
+        }
     }
 }

tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@@ -464,7 +464,9 @@ public static class Issues
                 public const string Issue1962NoColorTable = "Gif/issues/issue1962_tiniest_gif_1st.gif";
                 public const string Issue2012EmptyXmp = "Gif/issues/issue2012_Stronghold-Crusader-Extreme-Cover.gif";
                 public const string Issue2012BadMinCode = "Gif/issues/issue2012_drona1.gif";
-            public const string Issue2758 = "Gif/issues/issue_2758.gif";
+                public const string Issue2758 = "Gif/issues/issue_2758.gif";
+                public const string Issue2859_A = "Gif/issues/issue_2859_A.gif";
+                public const string Issue2859_B = "Gif/issues/issue_2859_B.gif";
             }
 
             public static readonly string[] All = { Rings, Giphy, Cheers, Trans, Kumin, Leo, Ratio4x1, Ratio1x4 };