Rust: Label source annotations in the test properly.

Author: geoffw0

rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected

@@ -1,10 +0,0 @@
-#select
-testFailures
-| deallocation.rs:20:36:20:54 | //... | Missing result: Source=dealloc |
-| deallocation.rs:70:47:70:71 | //... | Missing result: Source=dealloc_array |
-| deallocation.rs:112:44:112:59 | //... | Missing result: Source=free |
-| deallocation.rs:123:45:123:64 | //... | Missing result: Source=dangling |
-| deallocation.rs:124:47:124:70 | //... | Missing result: Source=dangling_mut |
-| deallocation.rs:125:41:125:56 | //... | Missing result: Source=null |
-| deallocation.rs:176:32:176:56 | //... | Missing result: Source=drop_in_place |
-| deallocation.rs:242:33:242:57 | //... | Missing result: Source=drop_in_place |

rust/ql/test/query-tests/security/CWE-825/deallocation.rs

@@ -17,7 +17,7 @@ pub fn test_alloc(mode: i32) {
 		println!("	v3 = {v3}");
 		println!("	v4 = {v4}");
 
-		std::alloc::dealloc(m1, layout); // $ Source=dealloc
+		std::alloc::dealloc(m1, layout); // $ Source[rust/access-invalid-pointer]=dealloc
 		// (m1, m2 are now dangling)
 
 		match mode {
@@ -67,7 +67,7 @@ pub fn test_alloc_array(mode: i32) {
 		println!("	v1 = {v1}");
 		println!("	v2 = {v2}");
 
-		std::alloc::dealloc(m2 as *mut u8, layout); // $ Source=dealloc_array
+		std::alloc::dealloc(m2 as *mut u8, layout); // $ Source[rust/access-invalid-pointer]=dealloc_array
 		// m1, m2 are now dangling
 
 		match mode {
@@ -109,7 +109,7 @@ pub fn test_libc() {
 		let v1 = *my_ptr; // GOOD
 		println!("	v1 = {v1}");
 
-		libc::free(my_ptr as *mut libc::c_void); // $ Source=free
+		libc::free(my_ptr as *mut libc::c_void); // $ Source[rust/access-invalid-pointer]=free
 		// (my_ptr is now dangling)
 
 		let v2 = *my_ptr; // $ Alert[rust/access-invalid-pointer]=free
@@ -120,9 +120,9 @@ pub fn test_libc() {
 // --- std::ptr ---
 
 pub fn test_ptr_invalid(mode: i32) {
-	let p1: *const i64 = std::ptr::dangling(); // $ Source=dangling
-	let p2: *mut i64 = std::ptr::dangling_mut(); // $ Source=dangling_mut
-	let p3: *const i64 = std::ptr::null(); // $ Source=null
+	let p1: *const i64 = std::ptr::dangling(); // $ Source[rust/access-invalid-pointer]=dangling
+	let p2: *mut i64 = std::ptr::dangling_mut(); // $ Source[rust/access-invalid-pointer]=dangling_mut
+	let p3: *const i64 = std::ptr::null(); // $ Source[rust/access-invalid-pointer]=null
 
 	if mode == 120 {
 		unsafe {
@@ -173,7 +173,7 @@ pub fn test_ptr_drop(mode: i32) {
 		println!("	v1 = {v1}");
 		println!("	v2 = {v2}");
 
-		std::ptr::drop_in_place(p1); // $ Source=drop_in_place
+		std::ptr::drop_in_place(p1); // $ Source[rust/access-invalid-pointer]=drop_in_place
 		// explicitly destructs the pointed-to `m2`
 
 		if mode == 1 {
@@ -212,7 +212,7 @@ impl Drop for MyDropBuffer {
 
 		unsafe {
 			_ = *self.ptr;
-			drop(*self.ptr); // $ MISSING: Source=drop
+			drop(*self.ptr); // $ MISSING: Source[rust/access-invalid-pointer]=drop
 			_ = *self.ptr; // $ MISSING: Alert[rust/access-invalid-pointer]=drop
 			std::alloc::dealloc(self.ptr, layout);
 		}
@@ -239,7 +239,7 @@ fn test_qhelp_example_good(ptr: *mut String) {
 
 fn test_qhelp_example_bad(ptr: *mut String) {
 	unsafe {
-		std::ptr::drop_in_place(ptr); // $ Source=drop_in_place
+		std::ptr::drop_in_place(ptr); // $ Source[rust/access-invalid-pointer]=drop_in_place
 	}
 
 	// ...
@@ -280,7 +280,7 @@ pub fn test_vec_reserve() {
 		println!("	v1 = {}", v1);
 	}
 
-	vec1.reserve(1000); // $ MISSING: Source=reserve
+	vec1.reserve(1000); // $ MISSING: Source[rust/access-invalid-pointer]=reserve
 	// (may invalidate the pointer)
 
 	unsafe {
@@ -300,7 +300,7 @@ pub fn test_vec_reserve() {
 	}
 
 	for _i in 0..1000 {
-		vec2.push(0); // $ MISSING: Source=push
+		vec2.push(0); // $ MISSING: Source[rust/access-invalid-pointer]=push
 		// (may invalidate the pointer)
 	}