Fix crash on empty zstd response body #411
Merged
Conversation
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
Fixes a panic for `xh head https://httpbin.dev/zstd`. `ZstdDecoder::new()` returns a `Result`. We used to panic on this, but it needs to be a `Read` error instead, so we can suppress the error for an empty input the way we do for other decoders. Our existing approach couldn't handle this, so I ended up refactoring the system. I think it's cleaner now, though still weird. We now also preserve the original decoder error instead of `.to_string()`ing it, or strip it completely if there was an I/O error. That should improve the error reporting.
We used to use `ErrorKind::InvalidData` to communicate binary data that should not be shown in the terminal but that one can actually happen in other cases as well. brotli decoding uses that ErrorKind, and we now use it for all decompressors. So an invalid brotli response would under certain circumstances render as "NOTE: binary data not shown in terminal". We can use our own error type to track this properly.
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 a panic for
xh head https://httpbin.dev/zstd.ZstdDecoder::new()returns aResult. We used to panic on this, but it needs to be aReaderror instead, so we can suppress the error for an empty input the way we do for other decoders.Our existing approach couldn't handle this, so I ended up refactoring the system. I think it's cleaner now, though still weird.
We now also preserve the original decoder error instead of
.to_string()ing it, or strip it completely if there was an I/O error. That should improve the error reporting.This PR also contains a fix for the binary data detection: in certain circumstances, like an invalid streaming brotli response, it would print the "binary data" note instead of an error.
Resolves #409.