Jpeg Fuzz Fixes (SixLabors#836)

* Nomalize jpeg exceptions. Fix SixLabors#821 * Fix SixLabors#822 * Fix SixLabors#823 * Check for correct QT index. Touch SixLabors#824 * Check DHT props. Touch SixLabors#824 * Limit sampling factors to 1 & 2. Touch SixLabors#824 * Add already fixed image 4. Touch SixLabors#824 * Check for excessive code lengths. Touch SixLabors#824 * Add already fixed image 6. Touch SixLabors#824 * Lint progressive scan details. Touch SixLabors#824 * Add already fixed image 8. Fix SixLabors#824 * Remove duplicate per-block checks * Add already fixed image 1. Touch SixLabors#825 * Don't throw on bad JFIF density units. * Add already fixed image 3. Touch SixLabors#825 * Add already fixed image 4. Fix SixLabors#825 * Check SOFn marker length. Touch SixLabors#826 * Add already fixed image 2. Touch SixLabors#826 * Add already fixed image 3. Fix SixLabors#826 * Add fixed already fixed image. Fix SixLabors#827 * Revert unneeded bounds check introduced in SixLabors#804
antonfirsov · Feb 17, 2019 · 2e241f5 · 2e241f5
1 parent 3f362c0
commit 2e241f5
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -172,8 +172,31 @@ public static class Issues
                 public const string OrderedInterleavedProgressive723C = "Jpg/issues/Issue723-Ordered-Interleaved-Progressive-C.jpg";
                 public const string ExifGetString750Transform = "Jpg/issues/issue750-exif-tranform.jpg";
                 public const string ExifGetString750Load = "Jpg/issues/issue750-exif-load.jpg";
-                public const string InvalidJpegThrowsWrongException797 = "Jpg/issues/Issue797-InvalidImage.jpg";
-                public const string AccessViolationException798 = "Jpg/issues/Issue798-AccessViolationException.jpg";
+
+                public static class Fuzz
+                {
+                    public const string NullReferenceException797 = "Jpg/issues/fuzz/Issue797-NullReferenceException.jpg";
+                    public const string AccessViolationException798 = "Jpg/issues/fuzz/Issue798-AccessViolationException.jpg";
+                    public const string DivideByZeroException821 = "Jpg/issues/fuzz/Issue821-DivideByZeroException.jpg";
+                    public const string DivideByZeroException822 = "Jpg/issues/fuzz/Issue822-DivideByZeroException.jpg";
+                    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";
+                    public const string IndexOutOfRangeException824D = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-D.jpg";
+                    public const string IndexOutOfRangeException824E = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-E.jpg";
+                    public const string IndexOutOfRangeException824F = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-F.jpg";
+                    public const string IndexOutOfRangeException824G = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-G.jpg";
+                    public const string IndexOutOfRangeException824H = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-H.jpg";
+                    public const string ArgumentOutOfRangeException825A = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-A.jpg";
+                    public const string ArgumentOutOfRangeException825B = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-B.jpg";
+                    public const string ArgumentOutOfRangeException825C = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-C.jpg";
+                    public const string ArgumentOutOfRangeException825D = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-D.jpg";
+                    public const string ArgumentException826A = "Jpg/issues/fuzz/Issue826-ArgumentException-A.jpg";
+                    public const string ArgumentException826B = "Jpg/issues/fuzz/Issue826-ArgumentException-B.jpg";
+                    public const string ArgumentException826C = "Jpg/issues/fuzz/Issue826-ArgumentException-C.jpg";
+                    public const string AccessViolationException827 = "Jpg/issues/fuzz/Issue827-AccessViolationException.jpg";
+                }
             }
 
             public static readonly string[] All = Baseline.All.Concat(Progressive.All).ToArray();
@@ -236,7 +259,7 @@ public static class Bmp
             public const string Rgba321010102 = "Bmp/rgba32-1010102.bmp";
             public const string RgbaAlphaBitfields = "Bmp/rgba32abf.bmp";
 
-            public static readonly string[] BitFields 
+            public static readonly string[] BitFields
             = {
                   Rgb32bfdef,
                   Rgb32bf,