Skip to content

Commit 2e241f5

Browse files
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
1 parent 3f362c0 commit 2e241f5

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

tests/ImageSharp.Tests/TestImages.cs

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,31 @@ public static class Issues
172172
public const string OrderedInterleavedProgressive723C = "Jpg/issues/Issue723-Ordered-Interleaved-Progressive-C.jpg";
173173
public const string ExifGetString750Transform = "Jpg/issues/issue750-exif-tranform.jpg";
174174
public const string ExifGetString750Load = "Jpg/issues/issue750-exif-load.jpg";
175-
public const string InvalidJpegThrowsWrongException797 = "Jpg/issues/Issue797-InvalidImage.jpg";
176-
public const string AccessViolationException798 = "Jpg/issues/Issue798-AccessViolationException.jpg";
175+
176+
public static class Fuzz
177+
{
178+
public const string NullReferenceException797 = "Jpg/issues/fuzz/Issue797-NullReferenceException.jpg";
179+
public const string AccessViolationException798 = "Jpg/issues/fuzz/Issue798-AccessViolationException.jpg";
180+
public const string DivideByZeroException821 = "Jpg/issues/fuzz/Issue821-DivideByZeroException.jpg";
181+
public const string DivideByZeroException822 = "Jpg/issues/fuzz/Issue822-DivideByZeroException.jpg";
182+
public const string NullReferenceException823 = "Jpg/issues/fuzz/Issue823-NullReferenceException.jpg";
183+
public const string IndexOutOfRangeException824A = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-A.jpg";
184+
public const string IndexOutOfRangeException824B = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-B.jpg";
185+
public const string IndexOutOfRangeException824C = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-C.jpg";
186+
public const string IndexOutOfRangeException824D = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-D.jpg";
187+
public const string IndexOutOfRangeException824E = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-E.jpg";
188+
public const string IndexOutOfRangeException824F = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-F.jpg";
189+
public const string IndexOutOfRangeException824G = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-G.jpg";
190+
public const string IndexOutOfRangeException824H = "Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-H.jpg";
191+
public const string ArgumentOutOfRangeException825A = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-A.jpg";
192+
public const string ArgumentOutOfRangeException825B = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-B.jpg";
193+
public const string ArgumentOutOfRangeException825C = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-C.jpg";
194+
public const string ArgumentOutOfRangeException825D = "Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-D.jpg";
195+
public const string ArgumentException826A = "Jpg/issues/fuzz/Issue826-ArgumentException-A.jpg";
196+
public const string ArgumentException826B = "Jpg/issues/fuzz/Issue826-ArgumentException-B.jpg";
197+
public const string ArgumentException826C = "Jpg/issues/fuzz/Issue826-ArgumentException-C.jpg";
198+
public const string AccessViolationException827 = "Jpg/issues/fuzz/Issue827-AccessViolationException.jpg";
199+
}
177200
}
178201

179202
public static readonly string[] All = Baseline.All.Concat(Progressive.All).ToArray();
@@ -236,7 +259,7 @@ public static class Bmp
236259
public const string Rgba321010102 = "Bmp/rgba32-1010102.bmp";
237260
public const string RgbaAlphaBitfields = "Bmp/rgba32abf.bmp";
238261

239-
public static readonly string[] BitFields
262+
public static readonly string[] BitFields
240263
= {
241264
Rgb32bfdef,
242265
Rgb32bf,

0 commit comments

Comments
 (0)