OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly check defined bits range

Browse Source
This commit is contained in:
Oliver Schneider 2018-05-24 11:12:33 +02:00
parent cfd5fb5102
commit 879d8f7070
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_mir/interpret/memory.rs
View File

@ -233,7 +233,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
(ptr.offset.bytes(), alloc.align)
}
Scalar::Bits { bits, defined } => {
if defined <= self.pointer_size().bits() as u8 {
if (defined as u64) < self.pointer_size().bits() {
return err!(ReadUndefBytes);
}
// FIXME: what on earth does this line do? docs or fix needed!
@ -750,7 +750,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
val.offset.bytes() as u128
}
Scalar::Bits { bits, defined } if defined >= size.bits() as u8 && defined != 0 => bits,
Scalar::Bits { bits, defined } if defined as u64 >= size.bits() && size.bits() != 0 => bits,
Scalar::Bits { .. } => {
self.check_align(ptr.into(), ptr_align)?;