diff --git a/.gitattributes b/.gitattributes
index 355b64dce1..f97695f901 100644
--- a/.gitattributes
+++ b/.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
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5b3d294bc5..45769c2163 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.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: |
@@ -91,7 +101,7 @@ jobs:
         run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
 
       - name: Git Setup LFS Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: lfs-cache
         with:
           path: .git/lfs
@@ -104,7 +114,7 @@ jobs:
         uses: NuGet/setup-nuget@v1
 
       - name: NuGet Setup Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: nuget-cache
         with:
           path: ~/.nuget
@@ -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
@@ -181,7 +191,7 @@ jobs:
         uses: NuGet/setup-nuget@v1
 
       - name: NuGet Setup Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: nuget-cache
         with:
           path: ~/.nuget
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index 2b14f2a4b7..45b856a15c 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -34,7 +34,7 @@ jobs:
         run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
 
       - name: Git Setup LFS Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: lfs-cache
         with:
           path: .git/lfs
@@ -47,7 +47,7 @@ jobs:
         uses: NuGet/setup-nuget@v1
 
       - name: NuGet Setup Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: nuget-cache
         with:
           path: ~/.nuget
diff --git a/Directory.Build.props b/Directory.Build.props
index 26b3cc5afc..b46c0f19f2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,7 +23,7 @@
 
   <PropertyGroup Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
     <!-- Workaround various issues bound to implicit language features. -->
-    <LangVersion>preview</LangVersion>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <!--
diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
index aa4327a1a0..6ad88f95cf 100644
--- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
@@ -38,22 +38,22 @@ internal sealed class LzwDecoder : IDisposable
         /// <summary>
         /// The prefix buffer.
         /// </summary>
-        private readonly IMemoryOwner<int> prefix;
+        private readonly IMemoryOwner<int> prefixOwner;
 
         /// <summary>
         /// The suffix buffer.
         /// </summary>
-        private readonly IMemoryOwner<int> suffix;
+        private readonly IMemoryOwner<int> suffixOwner;
 
         /// <summary>
         /// The scratch buffer for reading data blocks.
         /// </summary>
-        private readonly IMemoryOwner<byte> scratchBuffer;
+        private readonly IMemoryOwner<byte> bufferOwner;
 
         /// <summary>
         /// The pixel stack buffer.
         /// </summary>
-        private readonly IMemoryOwner<int> pixelStack;
+        private readonly IMemoryOwner<int> pixelStackOwner;
         private readonly int minCodeSize;
         private readonly int clearCode;
         private readonly int endCode;
@@ -80,11 +80,12 @@ internal sealed class LzwDecoder : IDisposable
         public LzwDecoder(MemoryAllocator memoryAllocator, BufferedReadStream stream, int minCodeSize)
         {
             this.stream = stream ?? throw new ArgumentNullException(nameof(stream));
+            Guard.IsTrue(IsValidMinCodeSize(minCodeSize), nameof(minCodeSize), "Invalid minimum code size.");
 
-            this.prefix = memoryAllocator.Allocate<int>(MaxStackSize, AllocationOptions.Clean);
-            this.suffix = memoryAllocator.Allocate<int>(MaxStackSize, AllocationOptions.Clean);
-            this.pixelStack = memoryAllocator.Allocate<int>(MaxStackSize + 1, AllocationOptions.Clean);
-            this.scratchBuffer = memoryAllocator.Allocate<byte>(byte.MaxValue, AllocationOptions.None);
+            this.prefixOwner = memoryAllocator.Allocate<int>(MaxStackSize, AllocationOptions.Clean);
+            this.suffixOwner = memoryAllocator.Allocate<int>(MaxStackSize, AllocationOptions.Clean);
+            this.pixelStackOwner = memoryAllocator.Allocate<int>(MaxStackSize + 1, AllocationOptions.Clean);
+            this.bufferOwner = memoryAllocator.Allocate<byte>(byte.MaxValue, AllocationOptions.None);
             this.minCodeSize = minCodeSize;
 
             // Calculate the clear code. The value of the clear code is 2 ^ minCodeSize
@@ -94,11 +95,15 @@ public LzwDecoder(MemoryAllocator memoryAllocator, BufferedReadStream stream, in
             this.endCode = this.clearCode + 1;
             this.availableCode = this.clearCode + 2;
 
-            ref int suffixRef = ref MemoryMarshal.GetReference(this.suffix.GetSpan());
-            for (this.code = 0; this.code < this.clearCode; this.code++)
+            // Fill the suffix buffer with the initial values represented by the number of colors.
+            Span<int> suffix = this.suffixOwner.GetSpan().Slice(0, this.clearCode);
+            int i;
+            for (i = 0; i < suffix.Length; i++)
             {
-                Unsafe.Add(ref suffixRef, this.code) = (byte)this.code;
+                suffix[i] = i;
             }
+
+            this.code = i;
         }
 
         /// <summary>
@@ -113,8 +118,7 @@ public static bool IsValidMinCodeSize(int minCodeSize)
             // It is possible to specify a larger LZW minimum code size than the palette length in bits
             // which may leave a gap in the codes where no colors are assigned.
             // http://www.matthewflickinger.com/lab/whatsinagif/lzw_image_data.asp#lzw_compression
-            int clearCode = 1 << minCodeSize;
-            if (minCodeSize < 2 || minCodeSize > MaximumLzwBits || clearCode > MaxStackSize)
+            if (minCodeSize < 2 || minCodeSize > MaximumLzwBits || 1 << minCodeSize > MaxStackSize)
             {
                 // Don't attempt to decode the frame indices.
                 // Theoretically we could determine a min code size from the length of the provided
@@ -133,112 +137,139 @@ public void DecodePixelRow(Span<byte> indices)
         {
             indices.Clear();
 
-            ref byte pixelsRowRef = ref MemoryMarshal.GetReference(indices);
-            ref int prefixRef = ref MemoryMarshal.GetReference(this.prefix.GetSpan());
-            ref int suffixRef = ref MemoryMarshal.GetReference(this.suffix.GetSpan());
-            ref int pixelStackRef = ref MemoryMarshal.GetReference(this.pixelStack.GetSpan());
-            Span<byte> buffer = this.scratchBuffer.GetSpan();
-
-            int x = 0;
-            int xyz = 0;
-            while (xyz < indices.Length)
+            // Get span values from the owners.
+            Span<int> prefix = this.prefixOwner.GetSpan();
+            Span<int> suffix = this.suffixOwner.GetSpan();
+            Span<int> pixelStack = this.pixelStackOwner.GetSpan();
+            Span<byte> buffer = this.bufferOwner.GetSpan();
+
+            // Cache frequently accessed instance fields into locals.
+            // This helps avoid repeated field loads inside the tight loop.
+            BufferedReadStream stream = this.stream;
+            int top = this.top;
+            int bits = this.bits;
+            int codeSize = this.codeSize;
+            int codeMask = this.codeMask;
+            int minCodeSize = this.minCodeSize;
+            int availableCode = this.availableCode;
+            int oldCode = this.oldCode;
+            int first = this.first;
+            int data = this.data;
+            int count = this.count;
+            int bufferIndex = this.bufferIndex;
+            int code = this.code;
+            int clearCode = this.clearCode;
+            int endCode = this.endCode;
+
+            int i = 0;
+            while (i < indices.Length)
             {
-                if (this.top == 0)
+                if (top == 0)
                 {
-                    if (this.bits < this.codeSize)
+                    if (bits < codeSize)
                     {
                         // Load bytes until there are enough bits for a code.
-                        if (this.count == 0)
+                        if (count == 0)
                         {
                             // Read a new data block.
-                            this.count = this.ReadBlock(buffer);
-                            if (this.count == 0)
+                            count = ReadBlock(stream, buffer);
+                            if (count == 0)
                             {
                                 break;
                             }
 
-                            this.bufferIndex = 0;
+                            bufferIndex = 0;
                         }
 
-                        this.data += buffer[this.bufferIndex] << this.bits;
-
-                        this.bits += 8;
-                        this.bufferIndex++;
-                        this.count--;
+                        data += buffer[bufferIndex] << bits;
+                        bits += 8;
+                        bufferIndex++;
+                        count--;
                         continue;
                     }
 
                     // Get the next code
-                    this.code = this.data & this.codeMask;
-                    this.data >>= this.codeSize;
-                    this.bits -= this.codeSize;
+                    code = data & codeMask;
+                    data >>= codeSize;
+                    bits -= codeSize;
 
                     // Interpret the code
-                    if (this.code > this.availableCode || this.code == this.endCode)
+                    if (code > availableCode || code == endCode)
                     {
                         break;
                     }
 
-                    if (this.code == this.clearCode)
+                    if (code == clearCode)
                     {
                         // Reset the decoder
-                        this.codeSize = this.minCodeSize + 1;
-                        this.codeMask = (1 << this.codeSize) - 1;
-                        this.availableCode = this.clearCode + 2;
-                        this.oldCode = NullCode;
+                        codeSize = minCodeSize + 1;
+                        codeMask = (1 << codeSize) - 1;
+                        availableCode = clearCode + 2;
+                        oldCode = NullCode;
                         continue;
                     }
 
-                    if (this.oldCode == NullCode)
+                    if (oldCode == NullCode)
                     {
-                        Unsafe.Add(ref pixelStackRef, this.top++) = Unsafe.Add(ref suffixRef, this.code);
-                        this.oldCode = this.code;
-                        this.first = this.code;
+                        pixelStack[top++] = suffix[code];
+                        oldCode = code;
+                        first = code;
                         continue;
                     }
 
-                    int inCode = this.code;
-                    if (this.code == this.availableCode)
+                    int inCode = code;
+                    if (code == availableCode)
                     {
-                        Unsafe.Add(ref pixelStackRef, this.top++) = (byte)this.first;
-
-                        this.code = this.oldCode;
+                        pixelStack[top++] = first;
+                        code = oldCode;
                     }
 
-                    while (this.code > this.clearCode)
+                    while (code > clearCode && top < MaxStackSize)
                     {
-                        Unsafe.Add(ref pixelStackRef, this.top++) = Unsafe.Add(ref suffixRef, this.code);
-                        this.code = Unsafe.Add(ref prefixRef, this.code);
+                        pixelStack[top++] = suffix[code];
+                        code = prefix[code];
                     }
 
-                    int suffixCode = Unsafe.Add(ref suffixRef, this.code);
-                    this.first = suffixCode;
-                    Unsafe.Add(ref pixelStackRef, this.top++) = suffixCode;
+                    int suffixCode = suffix[code];
+                    first = suffixCode;
+                    pixelStack[top++] = suffixCode;
 
-                    // Fix for Gifs that have "deferred clear code" as per here :
+                    // Fix for GIFs that have "deferred clear code" as per:
                     // https://bugzilla.mozilla.org/show_bug.cgi?id=55918
-                    if (this.availableCode < MaxStackSize)
+                    if (availableCode < MaxStackSize)
                     {
-                        Unsafe.Add(ref prefixRef, this.availableCode) = this.oldCode;
-                        Unsafe.Add(ref suffixRef, this.availableCode) = this.first;
-                        this.availableCode++;
-                        if (this.availableCode == this.codeMask + 1 && this.availableCode < MaxStackSize)
+                        prefix[availableCode] = oldCode;
+                        suffix[availableCode] = first;
+                        availableCode++;
+                        if (availableCode == codeMask + 1 && availableCode < MaxStackSize)
                         {
-                            this.codeSize++;
-                            this.codeMask = (1 << this.codeSize) - 1;
+                            codeSize++;
+                            codeMask = (1 << codeSize) - 1;
                         }
                     }
 
-                    this.oldCode = inCode;
+                    oldCode = inCode;
                 }
 
                 // Pop a pixel off the pixel stack.
-                this.top--;
+                top--;
 
-                // Clear missing pixels
-                xyz++;
-                Unsafe.Add(ref pixelsRowRef, x++) = (byte)Unsafe.Add(ref pixelStackRef, this.top);
+                // Clear missing pixels.
+                indices[i++] = (byte)pixelStack[top];
             }
+
+            // Write back the local values to the instance fields.
+            this.top = top;
+            this.bits = bits;
+            this.codeSize = codeSize;
+            this.codeMask = codeMask;
+            this.availableCode = availableCode;
+            this.oldCode = oldCode;
+            this.first = first;
+            this.data = data;
+            this.count = count;
+            this.bufferIndex = bufferIndex;
+            this.code = code;
         }
 
         /// <summary>
@@ -247,130 +278,161 @@ public void DecodePixelRow(Span<byte> indices)
         /// <param name="length">The resulting index table length.</param>
         public void SkipIndices(int length)
         {
-            ref int prefixRef = ref MemoryMarshal.GetReference(this.prefix.GetSpan());
-            ref int suffixRef = ref MemoryMarshal.GetReference(this.suffix.GetSpan());
-            ref int pixelStackRef = ref MemoryMarshal.GetReference(this.pixelStack.GetSpan());
-            Span<byte> buffer = this.scratchBuffer.GetSpan();
-
-            int xyz = 0;
-            while (xyz < length)
+            // Get span values from the owners.
+            Span<int> prefix = this.prefixOwner.GetSpan();
+            Span<int> suffix = this.suffixOwner.GetSpan();
+            Span<int> pixelStack = this.pixelStackOwner.GetSpan();
+            Span<byte> buffer = this.bufferOwner.GetSpan();
+
+            // Cache frequently accessed instance fields into locals.
+            // This helps avoid repeated field loads inside the tight loop.
+            BufferedReadStream stream = this.stream;
+            int top = this.top;
+            int bits = this.bits;
+            int codeSize = this.codeSize;
+            int codeMask = this.codeMask;
+            int minCodeSize = this.minCodeSize;
+            int availableCode = this.availableCode;
+            int oldCode = this.oldCode;
+            int first = this.first;
+            int data = this.data;
+            int count = this.count;
+            int bufferIndex = this.bufferIndex;
+            int code = this.code;
+            int clearCode = this.clearCode;
+            int endCode = this.endCode;
+
+            int i = 0;
+            while (i < length)
             {
-                if (this.top == 0)
+                if (top == 0)
                 {
-                    if (this.bits < this.codeSize)
+                    if (bits < codeSize)
                     {
                         // Load bytes until there are enough bits for a code.
-                        if (this.count == 0)
+                        if (count == 0)
                         {
                             // Read a new data block.
-                            this.count = this.ReadBlock(buffer);
-                            if (this.count == 0)
+                            count = ReadBlock(stream, buffer);
+                            if (count == 0)
                             {
                                 break;
                             }
 
-                            this.bufferIndex = 0;
+                            bufferIndex = 0;
                         }
 
-                        this.data += buffer[this.bufferIndex] << this.bits;
-
-                        this.bits += 8;
-                        this.bufferIndex++;
-                        this.count--;
+                        data += buffer[bufferIndex] << bits;
+                        bits += 8;
+                        bufferIndex++;
+                        count--;
                         continue;
                     }
 
                     // Get the next code
-                    this.code = this.data & this.codeMask;
-                    this.data >>= this.codeSize;
-                    this.bits -= this.codeSize;
+                    code = data & codeMask;
+                    data >>= codeSize;
+                    bits -= codeSize;
 
                     // Interpret the code
-                    if (this.code > this.availableCode || this.code == this.endCode)
+                    if (code > availableCode || code == endCode)
                     {
                         break;
                     }
 
-                    if (this.code == this.clearCode)
+                    if (code == clearCode)
                     {
                         // Reset the decoder
-                        this.codeSize = this.minCodeSize + 1;
-                        this.codeMask = (1 << this.codeSize) - 1;
-                        this.availableCode = this.clearCode + 2;
-                        this.oldCode = NullCode;
+                        codeSize = minCodeSize + 1;
+                        codeMask = (1 << codeSize) - 1;
+                        availableCode = clearCode + 2;
+                        oldCode = NullCode;
                         continue;
                     }
 
-                    if (this.oldCode == NullCode)
+                    if (oldCode == NullCode)
                     {
-                        Unsafe.Add(ref pixelStackRef, this.top++) = Unsafe.Add(ref suffixRef, this.code);
-                        this.oldCode = this.code;
-                        this.first = this.code;
+                        pixelStack[top++] = suffix[code];
+                        oldCode = code;
+                        first = code;
                         continue;
                     }
 
-                    int inCode = this.code;
-                    if (this.code == this.availableCode)
+                    int inCode = code;
+                    if (code == availableCode)
                     {
-                        Unsafe.Add(ref pixelStackRef, this.top++) = (byte)this.first;
-
-                        this.code = this.oldCode;
+                        pixelStack[top++] = first;
+                        code = oldCode;
                     }
 
-                    while (this.code > this.clearCode)
+                    while (code > clearCode && top < MaxStackSize)
                     {
-                        Unsafe.Add(ref pixelStackRef, this.top++) = Unsafe.Add(ref suffixRef, this.code);
-                        this.code = Unsafe.Add(ref prefixRef, this.code);
+                        pixelStack[top++] = suffix[code];
+                        code = prefix[code];
                     }
 
-                    int suffixCode = Unsafe.Add(ref suffixRef, this.code);
-                    this.first = suffixCode;
-                    Unsafe.Add(ref pixelStackRef, this.top++) = suffixCode;
+                    int suffixCode = suffix[code];
+                    first = suffixCode;
+                    pixelStack[top++] = suffixCode;
 
-                    // Fix for Gifs that have "deferred clear code" as per here :
+                    // Fix for GIFs that have "deferred clear code" as per:
                     // https://bugzilla.mozilla.org/show_bug.cgi?id=55918
-                    if (this.availableCode < MaxStackSize)
+                    if (availableCode < MaxStackSize)
                     {
-                        Unsafe.Add(ref prefixRef, this.availableCode) = this.oldCode;
-                        Unsafe.Add(ref suffixRef, this.availableCode) = this.first;
-                        this.availableCode++;
-                        if (this.availableCode == this.codeMask + 1 && this.availableCode < MaxStackSize)
+                        prefix[availableCode] = oldCode;
+                        suffix[availableCode] = first;
+                        availableCode++;
+                        if (availableCode == codeMask + 1 && availableCode < MaxStackSize)
                         {
-                            this.codeSize++;
-                            this.codeMask = (1 << this.codeSize) - 1;
+                            codeSize++;
+                            codeMask = (1 << codeSize) - 1;
                         }
                     }
 
-                    this.oldCode = inCode;
+                    oldCode = inCode;
                 }
 
                 // Pop a pixel off the pixel stack.
-                this.top--;
+                top--;
 
-                // Clear missing pixels
-                xyz++;
+                // Skip missing pixels.
+                i++;
             }
+
+            // Write back the local values to the instance fields.
+            this.top = top;
+            this.bits = bits;
+            this.codeSize = codeSize;
+            this.codeMask = codeMask;
+            this.availableCode = availableCode;
+            this.oldCode = oldCode;
+            this.first = first;
+            this.data = data;
+            this.count = count;
+            this.bufferIndex = bufferIndex;
+            this.code = code;
         }
 
         /// <summary>
         /// Reads the next data block from the stream. A data block begins with a byte,
         /// which defines the size of the block, followed by the block itself.
         /// </summary>
+        /// <param name="stream">The stream to read from.</param>
         /// <param name="buffer">The buffer to store the block in.</param>
         /// <returns>
         /// The <see cref="int"/>.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private int ReadBlock(Span<byte> buffer)
+        private static int ReadBlock(BufferedReadStream stream, Span<byte> buffer)
         {
-            int bufferSize = this.stream.ReadByte();
+            int bufferSize = stream.ReadByte();
 
             if (bufferSize < 1)
             {
                 return 0;
             }
 
-            int count = this.stream.Read(buffer, 0, bufferSize);
+            int count = stream.Read(buffer, 0, bufferSize);
 
             return count != bufferSize ? 0 : bufferSize;
         }
@@ -378,10 +440,10 @@ private int ReadBlock(Span<byte> buffer)
         /// <inheritdoc />
         public void Dispose()
         {
-            this.prefix.Dispose();
-            this.suffix.Dispose();
-            this.pixelStack.Dispose();
-            this.scratchBuffer.Dispose();
+            this.prefixOwner.Dispose();
+            this.suffixOwner.Dispose();
+            this.pixelStackOwner.Dispose();
+            this.bufferOwner.Dispose();
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanScanBuffer.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanScanBuffer.cs
index 39e606fd39..c6fe34e22e 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanScanBuffer.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanScanBuffer.cs
@@ -22,6 +22,9 @@ internal struct HuffmanScanBuffer
         // Whether there is no more good data to pull from the stream for the current mcu.
         private bool badData;
 
+        // How many times have we hit the eof.
+        private int eofHitCount;
+
         public HuffmanScanBuffer(BufferedReadStream stream)
         {
             this.stream = stream;
@@ -31,6 +34,7 @@ public HuffmanScanBuffer(BufferedReadStream stream)
             this.MarkerPosition = 0;
             this.badData = false;
             this.NoData = false;
+            this.eofHitCount = 0;
         }
 
         /// <summary>
@@ -218,11 +222,16 @@ private int ReadStream()
             // we know we have hit the EOI and completed decoding the scan buffer.
             if (value == -1 || (this.badData && this.data == 0 && this.stream.Position >= this.stream.Length))
             {
-                // We've encountered the end of the file stream which means there's no EOI marker
+                // We've hit the end of the file stream more times than allowed which means there's no EOI marker
                 // in the image or the SOS marker has the wrong dimensions set.
-                this.badData = true;
-                this.NoData = true;
-                value = 0;
+                if (this.eofHitCount > JpegConstants.Huffman.FetchLoop)
+                {
+                    this.badData = true;
+                    this.NoData = true;
+                    value = 0;
+                }
+
+                this.eofHitCount++;
             }
 
             return value;
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
index 75a9800844..acc4c201b7 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.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;
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
index 9ecf8ad502..4e42722d2c 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.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);
+        }
     }
 }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 708e859eed..284e4fa254 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -229,6 +229,19 @@ public void Issue2133_DeduceColorSpace<TPixel>(TestImageProvider<TPixel> provide
             }
         }
 
+        // https://github.com/SixLabors/ImageSharp/issues/2638
+        [Theory]
+        [WithFile(TestImages.Jpeg.Issues.Issue2638, PixelTypes.Rgba32)]
+        public void Issue2638_DecodeWorks<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using (Image<TPixel> image = provider.GetImage(JpegDecoder))
+            {
+                image.DebugSave(provider);
+                image.CompareToOriginal(provider);
+            }
+        }
+
         // DEBUG ONLY!
         // The PDF.js output should be saved by "tests\ImageSharp.Tests\Formats\Jpg\pdfjs\jpeg-converter.htm"
         // into "\tests\Images\ActualOutput\JpegDecoderTests\"
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 1ba9ef2ef3..9ee63e5636 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -269,7 +269,8 @@ public static class Issues
                 public const string ValidExifArgumentNullExceptionOnEncode = "Jpg/issues/Issue2087-exif-null-reference-on-encode.jpg";
                 public const string Issue2133DeduceColorSpace = "Jpg/issues/Issue2133.jpg";
                 public const string HangBadScan = "Jpg/issues/Hang_C438A851.jpg";
-            public const string Issue2758 = "Jpg/issues/issue-2758.jpg";
+                public const string Issue2758 = "Jpg/issues/issue-2758.jpg";
+                public const string Issue2638 = "Jpg/issues/Issue2638.jpg";
 
                 public static class Fuzz
                 {
@@ -464,7 +465,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 };
diff --git a/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_A.gif/00.png b/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_A.gif/00.png
new file mode 100644
index 0000000000..d8c8df1263
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_A.gif/00.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daa78347749c6ff49891e2e379a373599cd35c98b453af9bf8eac52f615f935c
+size 12237
diff --git a/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_B.gif/00.png b/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_B.gif/00.png
new file mode 100644
index 0000000000..36c3683187
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_B.gif/00.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:731299281f942f277ce6803e0adda3b5dd0395eb79cae26cabc9d56905fae0fd
+size 1833
diff --git a/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_B.gif/01.png b/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_B.gif/01.png
new file mode 100644
index 0000000000..c03e5817f0
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/GifDecoderTests/Issue2859_LZWPixelStackOverflow_Rgba32_issue_2859_B.gif/01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50ccac7739142578d99a76b6d39ba377099d4a7ac30cbb0a5aee44ef1e7c9c8c
+size 1271
diff --git a/tests/Images/Input/Gif/issues/issue_2859_A.gif b/tests/Images/Input/Gif/issues/issue_2859_A.gif
new file mode 100644
index 0000000000..f19a047525
--- /dev/null
+++ b/tests/Images/Input/Gif/issues/issue_2859_A.gif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50a1a4afc62a3a36ff83596f1eb55d91cdd184c64e0d1339bbea17205c23eee1
+size 3406142
diff --git a/tests/Images/Input/Gif/issues/issue_2859_B.gif b/tests/Images/Input/Gif/issues/issue_2859_B.gif
new file mode 100644
index 0000000000..109b0f8797
--- /dev/null
+++ b/tests/Images/Input/Gif/issues/issue_2859_B.gif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db9b2992be772a4f0ac495e994a17c7c50fb6de9794cfb9afc4a3dc26ffdfae0
+size 4543
diff --git a/tests/Images/Input/Jpg/issues/Issue2638.jpg b/tests/Images/Input/Jpg/issues/Issue2638.jpg
new file mode 100644
index 0000000000..f42d67b0e8
--- /dev/null
+++ b/tests/Images/Input/Jpg/issues/Issue2638.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:208d5b0b727bbef120a7e090e020a48f99c9e264c2d3939ba749f8620853c1fe
+size 70876