od: don't abort on a huge --width#12885
Open
mistaste wants to merge 1 commit into
Open
Conversation
`od -w=1162652562662412622` aborted the process while allocating the line
buffer:
$ od -w=1162652562662412622 a
memory allocation of 1162652562662412626 bytes failed
Aborted (core dumped)
`InputDecoder::new` now computes the buffer size with a checked add and
reserves it with `try_reserve_exact`, returning an error instead of aborting.
An out-of-range width is reported cleanly:
$ od -w=1162652562662412622 a
od: memory exhausted
Fixes uutils#12839
|
GNU testsuite comparison: |
This file contains hidden or 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
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.
Summary
Fixes #12839.
od -w=<huge>aborted the process while allocating the line buffer:Change
InputDecoder::newnow computes the buffer size with a checked add and reservesit with
try_reserve_exact, returning anio::Errorinstead of aborting. Thecaller maps it to a clean error, matching the graceful out-of-memory behavior of
GNU
od:A width that does not fit in
usizeis still rejected by the existing"argument too large" check.
Checks
test_huge_width_argument; existingodwidth tests and theinput_decoderunit test still pass.cargo fmtclean,cargo clippy -p uu_od --all-targetsclean.