Check RequestPair payload length during decoding #7292
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
AbnerZheng
commented
Mar 22, 2024
| Ok(Self { request_id: u64::decode(buf)?, message: T::decode(buf)? }) | ||
| let header = Header::decode(buf)?; | ||
| // Check that the buffer is large enough for the payload length | ||
| if buf.len() < header.payload_length { |
There was a problem hiding this comment.
@Rjected I don't think this is necessary, because Header::decode check it already.
https://github.com/alloy-rs/rlp/blob/main/crates/rlp/src/header.rs#L71-L73
There was a problem hiding this comment.
yeah this looks redundant
There was a problem hiding this comment.
@Rjected I don't think this is necessary, because
Header::decodecheck it already.https://github.com/alloy-rs/rlp/blob/main/crates/rlp/src/header.rs#L71-L73
Right, then let's just do the consumption check
Rjected
requested changes
Mar 22, 2024
Rjected
requested changes
Mar 25, 2024
Comment on lines
481
to
483
| return Err(alloy_rlp::Error::Custom( | ||
| "Buffer did not consume exactly payload_length bytes", | ||
| )); |
There was a problem hiding this comment.
Let's use RlpError::UnexpectedLength, we've used it in other places where we check the consumed bytes vs the payload length
Rjected
approved these changes
Mar 25, 2024
Ruteri
pushed a commit
to Ruteri/reth
that referenced
this pull request
Apr 17, 2024
Ruteri
pushed a commit
to Ruteri/reth
that referenced
this pull request
Apr 17, 2024
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.
close #7278