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

Seek first bytes lengths before seek bits for __deku_input #502

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Seek first bytes lengths before seek bits for __deku_input #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8f31d1
Seek first bytes lengths before seek bits for __deku_input
wcampbell0x2a Nov 2, 2024
7ba5423
deku-derive: Add expect to seeking
wcampbell0x2a Nov 2, 2024
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
9 changes: 6 additions & 3 deletions deku-derive/src/macros/deku_read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> {
{
use ::#crate_::no_std_io::Seek;
use ::#crate_::no_std_io::SeekFrom;
if let Err(e) = __deku_reader.seek(SeekFrom::Current(i64::try_from(#num).unwrap())) {
let seek_amt = i64::try_from(#num).expect("could not convert into i64");
if let Err(e) = __deku_reader.seek(SeekFrom::Current(seek_amt)) {
return Err(::#crate_::DekuError::Io(e.kind()));
}
}
Expand All @@ -52,7 +53,8 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> {
{
use ::#crate_::no_std_io::Seek;
use ::#crate_::no_std_io::SeekFrom;
if let Err(e) = __deku_reader.seek(SeekFrom::End(i64::try_from(#num).unwrap())) {
let seek_amt = i64::try_from(#num).expect("could not convert into i64");
if let Err(e) = __deku_reader.seek(SeekFrom::End(seek_amt)) {
return Err(::#crate_::DekuError::Io(e.kind()));
}
}
Expand All @@ -62,7 +64,8 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> {
{
use ::#crate_::no_std_io::Seek;
use ::#crate_::no_std_io::SeekFrom;
if let Err(e) = __deku_reader.seek(SeekFrom::Start(u64::try_from(#num).unwrap())) {
let seek_amt = u64::try_from(#num).expect("could not convert into u64");
if let Err(e) = __deku_reader.seek(SeekFrom::Start(seek_amt)) {
return Err(::#crate_::DekuError::Io(e.kind()));
}
}
Expand Down
9 changes: 6 additions & 3 deletions deku-derive/src/macros/deku_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> {
{
use ::#crate_::no_std_io::Seek;
use ::#crate_::no_std_io::SeekFrom;
if let Err(e) = __deku_writer.seek(SeekFrom::Current(i64::try_from(#num).unwrap())) {
let seek_amt = i64::try_from(#num).expect("could not convert into i64");
if let Err(e) = __deku_writer.seek(SeekFrom::Current(seek_amt)) {
return Err(::#crate_::DekuError::Io(e.kind()));
}
}
Expand All @@ -43,7 +44,8 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> {
{
use ::#crate_::no_std_io::Seek;
use ::#crate_::no_std_io::SeekFrom;
if let Err(e) = __deku_writer.seek(SeekFrom::End(i64::try_from(#num).unwrap())) {
let seek_amt = i64::try_from(#num).expect("could not convert into i64");
if let Err(e) = __deku_writer.seek(SeekFrom::End(seek_amt)) {
return Err(::#crate_::DekuError::Io(e.kind()));
}
}
Expand All @@ -53,7 +55,8 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> {
{
use ::#crate_::no_std_io::Seek;
use ::#crate_::no_std_io::SeekFrom;
if let Err(e) = __deku_writer.seek(SeekFrom::Start(u64::try_from(#num).unwrap())) {
let seek_amt = u64::try_from(#num).expect("could not convert into u64");
if let Err(e) = __deku_writer.seek(SeekFrom::Start(seek_amt)) {
return Err(::#crate_::DekuError::Io(e.kind()));
}
}
Expand Down
18 changes: 17 additions & 1 deletion src/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,24 @@ impl<'a, R: Read + Seek> Reader<'a, R> {
{
#[cfg(feature = "logging")]
log::trace!("skip_bits: {amt}");

let bytes_amt = amt / 8;
let bits_amt = amt % 8;

// first, seek with bytes
if bytes_amt != 0 {
self.seek(SeekFrom::Current(
i64::try_from(bytes_amt).expect("could not convert seek usize into i64"),
))
.map_err(|e| DekuError::Io(e.kind()))?;
}

// Unlike normal seek not couting as bits_read, this one does
// to keep from_bytes returns
self.bits_read += bytes_amt * 8;

// Save, and keep the leftover bits since the read will most likely be less than a byte
self.read_bits(amt)?;
self.read_bits(bits_amt)?;
}

#[cfg(not(feature = "bits"))]
Expand Down
27 changes: 27 additions & 0 deletions tests/test_from_bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,30 @@ fn test_from_bytes_enum() {
assert_eq!(6, i);
assert_eq!(0b0101_1010u8, rest[0]);
}

#[cfg(feature = "bits")]
#[test]
fn test_from_bytes_long() {
#[derive(Debug, PartialEq, DekuRead, DekuWrite)]
#[deku(id_type = "u8", bits = 4)]
enum TestDeku {
#[deku(id = "0b0110")]
VariantA(#[deku(bits = 4)] u8),
#[deku(id = "0b0101")]
VariantB(#[deku(bits = 2)] u8),
}

let mut test_data = vec![0x00; 200];
test_data.extend([0b0110_0110u8, 0b0101_1010u8].to_vec());

let ((rest, i), ret_read) = TestDeku::from_bytes((&test_data, 200 * 8)).unwrap();
assert_eq!(TestDeku::VariantA(0b0110), ret_read);
assert_eq!(1, rest.len());
assert_eq!(0, i);

let ((rest, i), ret_read) = TestDeku::from_bytes((rest, i)).unwrap();
assert_eq!(TestDeku::VariantB(0b10), ret_read);
assert_eq!(1, rest.len());
assert_eq!(6, i);
assert_eq!(0b0101_1010u8, rest[0]);
}
Loading