Merge pull request #589 from RalfJung/check-bounds

use memory::check_bounds_ptr for offset check
rust-lang · Dec 26, 2018 · 6c2fc6d · 6c2fc6d
2 parents d0f57c7 + f2e14d9
commit 6c2fc6d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/operator.rs b/src/operator.rs
@@ -303,10 +303,9 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'a, 'mir, '
         if let Scalar::Ptr(ptr) = ptr {
             // Both old and new pointer must be in-bounds of a *live* allocation.
             // (Of the same allocation, but that part is trivial with our representation.)
-            let alloc = self.memory().get(ptr.alloc_id)?;
-            alloc.check_bounds_ptr(ptr)?;
+            self.memory().check_bounds_ptr(ptr, InboundsCheck::Live)?;
             let ptr = ptr.signed_offset(offset, self)?;
-            alloc.check_bounds_ptr(ptr)?;
+            self.memory().check_bounds_ptr(ptr, InboundsCheck::Live)?;
             Ok(Scalar::Ptr(ptr))
         } else {
             // An integer pointer. They can only be offset by 0, and we pretend there