fix: decompressing with --format overwrites the input file - #1049
Open
VXNCXNX wants to merge 1 commit into
Open
Conversation
With --format the extensions in the path are not parsed, so the output name was taken from the input's full file name and the two collided. With --here or --dir . that truncates the input archive to zero bytes and then fails, losing the data. Fixes ouch-org#442
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.
What's broken
ouch decompress <file> --format <fmt>derives the output name from the input's full file name, so the two are equal. With--here(or--dir .) the input is truncated to zero bytes and the run then fails, so the archive is gone.Fixes #442
Repro
The fix
Strip as many trailing known extensions as
--formatnames, sofile.zst.zst.zst --format zstwritesfile.zst.zst. A name with no known extension falls back to<name>-outputrather than colliding.Verification
decompress_with_format_flag_does_not_overwrite_inputasserts the input bytes are unchanged and the derived output exists. Reverting the name derivation fails it: the input reads back as empty.I also checked the paths this could have disturbed, comparing binaries built before and after: archive extraction with
--format, stdin input, and plain.gzdecompression without--formatall behave identically.Full suite passes.
cargo fmt --checkandcargo clippy --all-targets -- -D warningsclean. I built withbzip3off, sincelibbzip3-syswill not compile here (missingstddef.h), and nothing in the diff touches it.