Rooba
/
iced
mirror of https://github.com/icedland/iced.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 1.41.0 errors

This commit is contained in:
wtfsck 2021-05-06 21:57:21 +02:00
parent 3a8e25a0be
commit 97e64162b0
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/rust/iced-x86/src/decoder.rs
View File

@ -24,7 +24,7 @@ use crate::tuple_type_tbl::get_disp8n;
use crate::*;
use core::convert::TryFrom;
use core::iter::FusedIterator;
use core::{cmp, fmt, mem, ptr};
use core::{cmp, fmt, mem, ptr, u32};
use static_assertions::{const_assert, const_assert_eq};
#[rustfmt::skip]
@ -295,18 +295,20 @@ macro_rules! mk_read_value {
let data_ptr = $slf.data_ptr;
// This doesn't overflow data_ptr (verified in ctor since SIZE <= MAX_READ_SIZE)
#[allow(trivial_numeric_casts)]
if data_ptr + SIZE - 1 < $slf.max_data_ptr {
// SAFETY:
// - cast: It's OK to cast to an unaligned `*const uXX` since we call read_unaligned()
// - ptr::read_unaligned: ptr is readable and data (u8 slice) is initialized
let result = $from_le(unsafe { ptr::read_unaligned(data_ptr as *const $mem_ty) }) as $ret_ty;
// - data_ptr + SIZE doesn't overflow (verified in ctor since SIZE <= MAX_READ_SIZE)
// - data_ptr + SIZE <= self.max_data_ptr (see `if` check above)
$slf.data_ptr = data_ptr + SIZE;
result
} else {
$slf.state.flags |= StateFlags::IS_INVALID | StateFlags::NO_MORE_BYTES;
0
{
if data_ptr + SIZE - 1 < $slf.max_data_ptr {
// SAFETY:
// - cast: It's OK to cast to an unaligned `*const uXX` since we call read_unaligned()
// - ptr::read_unaligned: ptr is readable and data (u8 slice) is initialized
let result = $from_le(unsafe { ptr::read_unaligned(data_ptr as *const $mem_ty) }) as $ret_ty;
// - data_ptr + SIZE doesn't overflow (verified in ctor since SIZE <= MAX_READ_SIZE)
// - data_ptr + SIZE <= self.max_data_ptr (see `if` check above)
$slf.data_ptr = data_ptr + SIZE;
result
} else {
$slf.state.flags |= StateFlags::IS_INVALID | StateFlags::NO_MORE_BYTES;
0
}
}
};
}