Skip to content

Commit

Permalink
fix: apply sign extension when decoding int
Browse files Browse the repository at this point in the history
  • Loading branch information
paolobarbolini committed Aug 19, 2024
1 parent 291df5a commit 76c8773
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/buf/buf_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ macro_rules! buf_get_impl {
}};
}

// https://en.wikipedia.org/wiki/Sign_extension
fn sign_extend(val: u64, nbytes: usize) -> i64 {
let shift = (8 - nbytes) * 8;
(val << shift) as i64 >> shift
}

/// Read bytes from a buffer.
///
/// A buffer stores bytes in memory such that read operations are infallible.
Expand Down Expand Up @@ -923,7 +929,7 @@ pub trait Buf {
/// This function panics if there is not enough remaining data in `self`, or
/// if `nbytes` is greater than 8.
fn get_int(&mut self, nbytes: usize) -> i64 {
buf_get_impl!(be => self, i64, nbytes);
sign_extend(self.get_uint(nbytes), nbytes)
}

/// Gets a signed n-byte integer from `self` in little-endian byte order.
Expand All @@ -944,7 +950,7 @@ pub trait Buf {
/// This function panics if there is not enough remaining data in `self`, or
/// if `nbytes` is greater than 8.
fn get_int_le(&mut self, nbytes: usize) -> i64 {
buf_get_impl!(le => self, i64, nbytes);
sign_extend(self.get_uint_le(nbytes), nbytes)
}

/// Gets a signed n-byte integer from `self` in native-endian byte order.
Expand Down

0 comments on commit 76c8773

Please sign in to comment.