Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return an error if a decoded slice length doesn't fit into usize #491

Merged
merged 4 commits into from Jan 25, 2022
Merged

Return an error if a decoded slice length doesn't fit into usize #491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4c92d5
Return an error if a decoded slice length doesn't fit into usize
poljar Jan 24, 2022
cf60e08
Remove another two usize truncations
poljar Jan 25, 2022
9fe5d1b
Rename the error variant if the usize doesn't fit anymore
poljar Jan 25, 2022
c6c9b3d
Merge branch 'trunk' into poljar/check-if-len-fits-in-usize
VictorKoenders Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/de/mod.rs
View file
Open in desktop
Expand Up @@ -236,5 +236,7 @@ pub(crate) fn decode_option_variant<D: Decoder>(
/// Decodes the length of any slice, container, etc from the decoder
#[inline]
pub(crate) fn decode_slice_len<D: Decoder>(decoder: &mut D) -> Result<usize, DecodeError> {
u64::decode(decoder).map(|v| v as usize)
let v = u64::decode(decoder)?;

v.try_into().map_err(|_| DecodeError::SliceLength(v))
}
3 changes: 3 additions & 0 deletions src/error.rs
View file
Open in desktop
Expand Up @@ -116,6 +116,9 @@ pub enum DecodeError {
found: usize,
},

/// The encoded slice length doesn't fit into the decoded usize type.
SliceLength(u64),

/// Tried to decode an enum with no variants
EmptyEnum {
/// The type that was being decoded
Expand Down