From fae857fb1cd3f97df9831b9bc06ac2c33f2245b6 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Jun 2024 13:46:47 +1000
Subject: [PATCH] Clamp JPEG quality estimation results.

---
 .../Formats/Jpeg/Components/Quantization.cs   |  2 +-
 .../Formats/Jpg/JpegDecoderTests.Metadata.cs  | 27 +++++++++++++++++++
 tests/ImageSharp.Tests/TestImages.cs          |  1 +
 tests/Images/Input/Jpg/issues/issue-2758.jpg  |  3 +++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 tests/Images/Input/Jpg/issues/issue-2758.jpg

diff --git a/src/ImageSharp/Formats/Jpeg/Components/Quantization.cs b/src/ImageSharp/Formats/Jpeg/Components/Quantization.cs
index 3d53d5bfe..7dca1cf5e 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Quantization.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Quantization.cs
@@ -146,7 +146,7 @@ internal static class Quantization
             quality = (int)Math.Round(5000.0 / sumPercent);
         }
 
-        return quality;
+        return Numerics.Clamp(quality, MinQualityFactor, MaxQualityFactor);
     }
 
     /// <summary>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
index 1c203e734..e68dd1f87 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
@@ -8,6 +8,7 @@ using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities;
 
 // ReSharper disable InconsistentNaming
@@ -425,6 +426,32 @@ public partial class JpegDecoderTests
         VerifyEncodedStrings(exif);
     }
 
+    // https://github.com/SixLabors/ImageSharp/issues/2758
+    [Theory]
+    [WithFile(TestImages.Jpeg.Issues.Issue2758, PixelTypes.L8)]
+    public void Issue2758_DecodeWorks<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        using Image<TPixel> image = provider.GetImage(JpegDecoder.Instance);
+
+        Assert.Equal(59787, image.Width);
+        Assert.Equal(511, image.Height);
+
+        JpegMetadata meta = image.Metadata.GetJpegMetadata();
+
+        // Quality determination should be between 1-100.
+        Assert.Equal(15, meta.LuminanceQuality);
+        Assert.Equal(1, meta.ChrominanceQuality);
+
+        // We want to test the encoder to ensure the determined values can be encoded but not by encoding
+        // the full size image as it would be too slow.
+        // We will crop the image to a smaller size and then encode it.
+        image.Mutate(x => x.Crop(new(0, 0, 100, 100)));
+
+        using MemoryStream ms = new();
+        image.Save(ms, new JpegEncoder());
+    }
+
     private static void VerifyEncodedStrings(ExifProfile exif)
     {
         Assert.NotNull(exif);
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 879fed9d2..c571619d6 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -320,6 +320,7 @@ public static class TestImages
             public const string HangBadScan = "Jpg/issues/Hang_C438A851.jpg";
             public const string Issue2517 = "Jpg/issues/issue2517-bad-d7.jpg";
             public const string Issue2638 = "Jpg/issues/Issue2638.jpg";
+            public const string Issue2758 = "Jpg/issues/issue-2758.jpg";
 
             public static class Fuzz
             {
diff --git a/tests/Images/Input/Jpg/issues/issue-2758.jpg b/tests/Images/Input/Jpg/issues/issue-2758.jpg
new file mode 100644
index 000000000..48ee1159e
--- /dev/null
+++ b/tests/Images/Input/Jpg/issues/issue-2758.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f32a238b57b7073f7442f8ae7efd6ba3ae4cda30d57e6666fb8a1eaa27108558
+size 1412