fix overflow crash when displaying ETA #555
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
djc
reviewed
Jun 27, 2023
| @@ -77,7 +77,7 @@ impl fmt::Display for HumanDuration { | |||
| for (i, &(cur, _, _)) in UNITS.iter().enumerate() { | |||
| idx = i; | |||
| match UNITS.get(i + 1) { | |||
| Some(&next) if self.0 + next.0 / 2 >= cur + cur / 2 => break, | |||
| Some(&next) if self.0.saturating_add(next.0 / 2) >= cur + cur / 2 => break, | |||
There was a problem hiding this comment.
Do we also need saturating_add() for cur here?
There was a problem hiding this comment.
I don't think so, cur comes from a list of constants and none of them make it overflow.
djc
approved these changes
Jun 27, 2023
|
Right, thanks! |
This was referenced Jun 28, 2023
Closed
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.
Possible fix for #554, but I wasn't thorough checking for other possible sources of overflow (in particular in the ETA calculation itself, though from a glance it seems OK)