Fix panic for corrupt replays #41
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
NickCondron
force-pushed
the
skip-panic
branch
from
0e943d3
to
2869c74
Compare
hohav
reviewed
Dec 26, 2022
| @@ -972,7 +972,13 @@ pub fn deserialize<R: Read, H: Handlers>( | |||
| while (raw_len == 0 || bytes_read < raw_len) && last_event != Some(Event::GameEnd) { | |||
| if skip_frames && last_event == Some(Event::GameStart) { | |||
| // Skip to GameEnd, which we assume is the last event in the stream! | |||
| let skip = raw_len - bytes_read - payload_sizes[&(Event::GameEnd as u8)] as usize - 1; | |||
| let end_offset: usize = payload_sizes[&(Event::GameEnd as u8)] as usize + 1; | |||
| if raw_len == 0 || raw_len - bytes_read < end_offset { | |||
There was a problem hiding this comment.
I think this can just be if skip < 0 if you move it below let skip = ....
There was a problem hiding this comment.
The panic actually happens on the subtraction because the corrupt replay has raw_len as 0.
The alternative is to do a bunch of ugly casts to/from usize, but I don't think that would make sense here.
NickCondron
force-pushed
the
skip-panic
branch
from
2869c74
to
f4c194e
Compare
|
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.
Fixes #19