-
-
Notifications
You must be signed in to change notification settings - Fork 859
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.
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
GifDecoder: Limit lzw bits to a maximum of 12 bits #2744
Merged
+53
−12
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4387db9
Limit lzw bits to a maximum of 12 bits, fixes issue #2743
brianpopow 35ea961
Dispose currentLocalColorTable in final block
brianpopow eace209
Revert "Dispose currentLocalColorTable in final block"
brianpopow 287809c
Don't throw; return.
JimBobSquarePants File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -19,6 +19,11 @@ internal sealed class LzwDecoder : IDisposable | |||||
/// </summary> | ||||||
private const int MaxStackSize = 4096; | ||||||
|
||||||
/// <summary> | ||||||
/// The maximum bits for a lzw code. | ||||||
/// </summary> | ||||||
private const int MaximumLzwBits = 12; | ||||||
|
||||||
/// <summary> | ||||||
/// The null code. | ||||||
/// </summary> | ||||||
|
@@ -73,12 +78,12 @@ public void DecodePixels(int minCodeSize, Buffer2D<byte> pixels) | |||||
// It is possible to specify a larger LZW minimum code size than the palette length in bits | ||||||
// which may leave a gap in the codes where no colors are assigned. | ||||||
// http://www.matthewflickinger.com/lab/whatsinagif/lzw_image_data.asp#lzw_compression | ||||||
if (minCodeSize < 2 || clearCode > MaxStackSize) | ||||||
if (minCodeSize < 2 || minCodeSize > MaximumLzwBits || clearCode > MaxStackSize) | ||||||
{ | ||||||
// Don't attempt to decode the frame indices. | ||||||
// Theoretically we could determine a min code size from the length of the provided | ||||||
// color palette but we won't bother since the image is most likely corrupted. | ||||||
GifThrowHelper.ThrowInvalidImageContentException("Gif Image does not contain a valid LZW minimum code."); | ||||||
return; | ||||||
} | ||||||
|
||||||
// The resulting index table length. | ||||||
|
@@ -245,7 +250,7 @@ public void SkipIndices(int minCodeSize, int length) | |||||
// It is possible to specify a larger LZW minimum code size than the palette length in bits | ||||||
// which may leave a gap in the codes where no colors are assigned. | ||||||
// http://www.matthewflickinger.com/lab/whatsinagif/lzw_image_data.asp#lzw_compression | ||||||
if (minCodeSize < 2 || clearCode > MaxStackSize) | ||||||
if (minCodeSize < 2 || minCodeSize > MaximumLzwBits || clearCode > MaxStackSize) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
or move this check into a helper, than it's more self-documenting what's going on. |
||||||
{ | ||||||
// Don't attempt to decode the frame indices. | ||||||
// Theoretically we could determine a min code size from the length of the provided | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...ReferenceOutput/GifDecoderTests/Issue2012BadMinCode_Rgba32_issue2012_drona1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/00.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ferenceOutput/GifDecoderTests/IssueTooLargeLzwBits_Rgba32_issue_2743.gif/07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To save a comparison:
(due the
Unsafe.Add
below I guess this method is hot enough...)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks for the suggestions @gfoidl, but I do not see any difference when I execute gif decoder benchmark.
I do not want to sacrifice the readability here, if it does not really improve the performance.