Skip to content

Fix minimal encoding of minimum int values #11

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

Open
wladh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix minimal encoding of minimum int values #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions msgpacker/src/integer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,17 @@ impl Integer {
let mut n = 0;

match self {
Self::Int64(i) if *i <= i32::MIN as i64 => {
Self::Int64(i) if *i < i32::MIN as i64 => {
n += buffer::put(&mut writer, &[u8::from(MessageFormat::Int64)])?;
n += buffer::put(&mut writer, &i.to_be_bytes())?;
}

Self::Int64(i) if *i <= i16::MIN as i64 => {
Self::Int64(i) if *i < i16::MIN as i64 => {
n += buffer::put(&mut writer, &[u8::from(MessageFormat::Int32)])?;
n += buffer::put(&mut writer, &(*i as i32).to_be_bytes())?;
}

Self::Int64(i) if *i <= i8::MIN as i64 => {
Self::Int64(i) if *i < i8::MIN as i64 => {
n += buffer::put(&mut writer, &[u8::from(MessageFormat::Int16)])?;
n += buffer::put(&mut writer, &(*i as i16).to_be_bytes())?;
}
Expand Down Expand Up @@ -168,11 +168,11 @@ impl Integer {
impl SizeableMessage for Integer {
fn packed_len(&self) -> usize {
match self {
Self::Int64(i) if *i <= i32::MIN as i64 => 9,
Self::Int64(i) if *i < i32::MIN as i64 => 9,

Self::Int64(i) if *i <= i16::MIN as i64 => 5,
Self::Int64(i) if *i < i16::MIN as i64 => 5,

Self::Int64(i) if *i <= i8::MIN as i64 => 3,
Self::Int64(i) if *i < i8::MIN as i64 => 3,

Self::Int64(i) if *i <= -33 => 2,

Expand Down