Skip to content

Jpeg Fuzz Fixes #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimBobSquarePants merged 23 commits into from
Feb 17, 2019
Merged

Jpeg Fuzz Fixes #836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
903e4cd
Nomalize jpeg exceptions. Fix #821
JimBobSquarePants Feb 15, 2019
7fa95ec
Merge branch 'master' into js/jpeg-security
JimBobSquarePants Feb 15, 2019
9823c85
Merge branch 'master' into js/jpeg-security
JimBobSquarePants Feb 15, 2019
925b25d
Fix #822
JimBobSquarePants Feb 15, 2019
fdeb6ea
Fix #823
JimBobSquarePants Feb 16, 2019
9722e81
Check for correct QT index. Touch #824
JimBobSquarePants Feb 16, 2019
af78ccf
Check DHT props. Touch #824
JimBobSquarePants Feb 16, 2019
bf55db7
Limit sampling factors to 1 & 2. Touch #824
JimBobSquarePants Feb 16, 2019
e984f86
Add already fixed image 4. Touch #824
JimBobSquarePants Feb 16, 2019
510c363
Check for excessive code lengths. Touch #824
JimBobSquarePants Feb 16, 2019
9efdcb6
Add already fixed image 6. Touch #824
JimBobSquarePants Feb 16, 2019
8d974c5
Lint progressive scan details. Touch #824
JimBobSquarePants Feb 16, 2019
c405175
Add already fixed image 8. Fix #824
JimBobSquarePants Feb 16, 2019
e4b2cb7
Remove duplicate per-block checks
JimBobSquarePants Feb 16, 2019
6cb10dc
Add already fixed image 1. Touch #825
JimBobSquarePants Feb 16, 2019
d6703d8
Don't throw on bad JFIF density units.
JimBobSquarePants Feb 17, 2019
9bbd69a
Add already fixed image 3. Touch #825
JimBobSquarePants Feb 17, 2019
23b7161
Add already fixed image 4. Fix #825
JimBobSquarePants Feb 17, 2019
e340769
Check SOFn marker length. Touch #826
JimBobSquarePants Feb 17, 2019
cf98f53
Add already fixed image 2. Touch #826
JimBobSquarePants Feb 17, 2019
6f83609
Add already fixed image 3. Fix #826
JimBobSquarePants Feb 17, 2019
caacfc3
Add fixed already fixed image. Fix #827
JimBobSquarePants Feb 17, 2019
1e38243
Revert unneeded bounds check introduced in #804
JimBobSquarePants Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add already fixed image 2. Touch #826
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Feb 17, 2019
commit cf98f531a364f24ce8948ff4f94a97c7238206b0
3 changes: 2 additions & 1 deletion tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ public partial class JpegDecoderTests
TestImages.Jpeg.Issues.Fuzz.ArgumentOutOfRangeException825A,
TestImages.Jpeg.Issues.Fuzz.ArgumentOutOfRangeException825C,
TestImages.Jpeg.Issues.Fuzz.ArgumentOutOfRangeException825D,
TestImages.Jpeg.Issues.Fuzz.ArgumentException826A
TestImages.Jpeg.Issues.Fuzz.ArgumentException826A,
TestImages.Jpeg.Issues.Fuzz.ArgumentException826B
};

private static readonly Dictionary<string, float> CustomToleranceValues =
Expand Down
1 change: 1 addition & 0 deletions tests/ImageSharp.Tests/TestImages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public static class Fuzz
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";
}
}

Expand Down
Binary file added tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-B.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.