Skip invalid markers during jpeg decoding #2147
Merged
Conversation
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
brianpopow
reviewed
Jun 5, 2022
| @@ -491,7 +488,8 @@ internal void ParseStream(BufferedReadStream stream, SpectralConverter spectralC | |||
| } | |||
|
|
|||
| // Read on. | |||
| fileMarker = FindNextFileMarker(this.markerBuffer, stream); | |||
| fileMarker = FindNextFileMarker(stream); | |||
| Console.WriteLine($"Found marker: {fileMarker.Marker} at {fileMarker.Position}"); | |||
There was a problem hiding this comment.
This Console.WriteLine is probably a leftover from debugging
brianpopow
approved these changes
Jun 5, 2022
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Prerequisites
Description
Fixes #2136
Given image contained extra unused bytes right at the end of the SOS segment containing RST markers and
0xFF00sequences. This lead to non-SOS parser to count them as valid markers and failed with exception. With this PR jpeg decoder now skips any invalid markers during non-SOS parsing so we can at least give the user something instead of exception.