Skip to content

Remove UB in pointer tests #58536

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

Merged
merged 2 commits into from
Feb 20, 2019
Merged

Remove UB in pointer tests #58536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3281e62
Remove UB in test_is_null test
LunaBorowska Feb 17, 2019
0cf1a91
Remove UB in test_ptr_subtraction test
LunaBorowska Feb 17, 2019
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
11 changes: 6 additions & 5 deletions src/libcore/tests/ptr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,17 @@ fn test() {
}

#[test]
#[cfg(not(miri))] // This test performs invalid OOB pointer arithmetic
fn test_is_null() {
let p: *const isize = null();
assert!(p.is_null());

let q = unsafe { p.offset(1) };
let q = p.wrapping_offset(1);
assert!(!q.is_null());

let mp: *mut isize = null_mut();
assert!(mp.is_null());

let mq = unsafe { mp.offset(1) };
let mq = mp.wrapping_offset(1);
assert!(!mq.is_null());

// Pointers to unsized types -- slices
Expand Down Expand Up @@ -208,7 +207,6 @@ fn test_ptr_addition() {
}

#[test]
#[cfg(not(miri))] // This test performs invalid OOB pointer arithmetic
fn test_ptr_subtraction() {
unsafe {
let xs = vec![0,1,2,3,4,5,6,7,8,9];
Expand All @@ -224,8 +222,11 @@ fn test_ptr_subtraction() {
let m_start = xs_mut.as_mut_ptr();
let mut m_ptr = m_start.offset(9);

while m_ptr >= m_start {
loop {
*m_ptr += *m_ptr;
if m_ptr == m_start {
break;
}
m_ptr = m_ptr.offset(-1);
}

Expand Down