Limit sampling factors to 1 & 2. Touch #824

SixLabors · Feb 16, 2019 · bf55db7 · bf55db7
1 parent af78ccf
commit bf55db7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponent.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponent.cs
@@ -22,7 +22,11 @@ public JpegComponent(MemoryAllocator memoryAllocator, JpegFrame frame, byte id,
             this.Frame = frame;
             this.Id = id;
 
-            if (horizontalFactor == 0 || verticalFactor == 0)
+            // Valid sampling factors are 1..2
+            if (horizontalFactor == 0
+                || verticalFactor == 0
+                || horizontalFactor > 2
+                || verticalFactor > 2)
             {
                 JpegThrowHelper.ThrowBadSampling();
             }

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs
@@ -63,7 +63,8 @@ public partial class JpegDecoderTests
             TestImages.Jpeg.Issues.Fuzz.DivideByZeroException822,
             TestImages.Jpeg.Issues.Fuzz.NullReferenceException823,
             TestImages.Jpeg.Issues.Fuzz.IndexOutOfRangeException824A,
-            TestImages.Jpeg.Issues.Fuzz.IndexOutOfRangeException824B
+            TestImages.Jpeg.Issues.Fuzz.IndexOutOfRangeException824B,
+            TestImages.Jpeg.Issues.Fuzz.IndexOutOfRangeException824C
 
         };
 

diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -182,6 +182,7 @@ public static class Fuzz
                     public const string NullReferenceException823 = "Jpg/issues/fuzz/Issue823-NullReferenceException.jpg";
                     public const string IndexOutOfRangeException824A = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-A.jpg";
                     public const string IndexOutOfRangeException824B = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-B.jpg";
+                    public const string IndexOutOfRangeException824C = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-C.jpg";
                 }
             }
 

diff --git a/tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-C.jpg b/tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-C.jpg