Avoid infinite loop when retrying after earlier fatal error. #520
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.
When
StreamingDecoder
reports an error, it leavesstate
set toNone
. Before this commit, callingnext_frame
in this state would have led to an infinite loop:ReadDecoder::decode_next
would loop forever (!self.at_eof
is true after an error) and would fail to make progress, becauseStreamingDecoder::update
sawstate
set toNone
then before this commit it wouldn't enter thenext_state
loop and would immediately return no progress (Ok((/* consumed bytes = */ 0, Decoded::Nothing))
).After this commit,
StreamingDecoder::update
checks if thestate
isNone
and treats this as an error.Code links:
ReadDecoder::decode_next
:image-png/src/decoder/mod.rs
Lines 299 to 316 in 272ae60
StreamingDecoder::update
:image-png/src/decoder/stream.rs
Lines 625 to 642 in 272ae60