Rust: Correct a few details in the test.

Author: geoffw0

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

@@ -13,7 +13,7 @@
 | deallocation.rs:131:14:131:15 | p2 | deallocation.rs:124:21:124:42 | ...::dangling_mut | deallocation.rs:131:14:131:15 | p2 | This operation dereferences a pointer that may be $@. | deallocation.rs:124:21:124:42 | ...::dangling_mut | invalid |
 | deallocation.rs:132:14:132:15 | p3 | deallocation.rs:125:23:125:36 | ...::null | deallocation.rs:132:14:132:15 | p3 | This operation dereferences a pointer that may be $@. | deallocation.rs:125:23:125:36 | ...::null | invalid |
 | deallocation.rs:180:15:180:16 | p1 | deallocation.rs:176:3:176:25 | ...::drop_in_place | deallocation.rs:180:15:180:16 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:176:3:176:25 | ...::drop_in_place | invalid |
-| deallocation.rs:214:18:214:20 | ptr | deallocation.rs:208:3:208:25 | ...::drop_in_place | deallocation.rs:214:18:214:20 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:208:3:208:25 | ...::drop_in_place | invalid |
+| deallocation.rs:216:18:216:20 | ptr | deallocation.rs:210:3:210:25 | ...::drop_in_place | deallocation.rs:216:18:216:20 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:210:3:210:25 | ...::drop_in_place | invalid |
 edges
 | deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:20:23:20:24 | [post] m1 | provenance | Src:MaD:3 MaD:3 |
 | deallocation.rs:20:23:20:24 | [post] m1 | deallocation.rs:26:15:26:16 | m1 | provenance |  |
@@ -40,8 +40,8 @@ edges
 | deallocation.rs:125:23:125:38 | ...::null(...) | deallocation.rs:125:6:125:7 | p3 | provenance |  |
 | deallocation.rs:176:3:176:25 | ...::drop_in_place | deallocation.rs:176:27:176:28 | [post] p1 | provenance | Src:MaD:6 MaD:6 |
 | deallocation.rs:176:27:176:28 | [post] p1 | deallocation.rs:180:15:180:16 | p1 | provenance |  |
-| deallocation.rs:208:3:208:25 | ...::drop_in_place | deallocation.rs:208:27:208:29 | [post] ptr | provenance | Src:MaD:6 MaD:6 |
-| deallocation.rs:208:27:208:29 | [post] ptr | deallocation.rs:214:18:214:20 | ptr | provenance |  |
+| deallocation.rs:210:3:210:25 | ...::drop_in_place | deallocation.rs:210:27:210:29 | [post] ptr | provenance | Src:MaD:6 MaD:6 |
+| deallocation.rs:210:27:210:29 | [post] ptr | deallocation.rs:216:18:216:20 | ptr | provenance |  |
 models
 | 1 | Sink: lang:core; crate::ptr::read; pointer-access; Argument[0] |
 | 2 | Sink: lang:core; crate::ptr::write; pointer-access; Argument[0] |
@@ -83,7 +83,7 @@ nodes
 | deallocation.rs:176:3:176:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
 | deallocation.rs:176:27:176:28 | [post] p1 | semmle.label | [post] p1 |
 | deallocation.rs:180:15:180:16 | p1 | semmle.label | p1 |
-| deallocation.rs:208:3:208:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
-| deallocation.rs:208:27:208:29 | [post] ptr | semmle.label | [post] ptr |
-| deallocation.rs:214:18:214:20 | ptr | semmle.label | ptr |
+| deallocation.rs:210:3:210:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
+| deallocation.rs:210:27:210:29 | [post] ptr | semmle.label | [post] ptr |
+| deallocation.rs:216:18:216:20 | ptr | semmle.label | ptr |
 subpaths

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

@@ -187,11 +187,13 @@ pub fn test_ptr_drop(mode: i32) {
 	}
 }
 
+// --- qhelp examples ---
+
 fn do_something(s: &String) {
 	println!("	s = {}", s);
 }
 
-fn test_qhelp_test_good(ptr: *mut String) {
+fn test_qhelp_example_good(ptr: *mut String) {
 	unsafe {
 		do_something(&*ptr);
 	}
@@ -203,7 +205,7 @@ fn test_qhelp_test_good(ptr: *mut String) {
 	}
 }
 
-fn test_qhelp_test_bad(ptr: *mut String) {
+fn test_qhelp_example_bad(ptr: *mut String) {
 	unsafe {
 		std::ptr::drop_in_place(ptr); // $ Source=drop_in_place
 	}
@@ -215,7 +217,7 @@ fn test_qhelp_test_bad(ptr: *mut String) {
 	}
 }
 
-pub fn test_qhelp_tests() {
+pub fn test_qhelp_examples() {
 	let layout = std::alloc::Layout::new::<[String; 2]>();
 	unsafe {
 		let ptr = std::alloc::alloc(layout);
@@ -226,14 +228,16 @@ pub fn test_qhelp_tests() {
 		*ptr1 = String::from("123");
 		*ptr2 = String::from("456");
 
-		test_qhelp_test_good(ptr1);
+		test_qhelp_example_good(ptr1);
 
-		test_qhelp_test_bad(ptr2);
+		test_qhelp_example_bad(ptr2);
 
 		std::alloc::dealloc(ptr, layout);
 	}
 }
 
+// --- Vec ---
+
 pub fn test_vec_reserve() {
 	let mut vec1 = Vec::<u16>::new();
 	vec1.push(100);

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

@@ -129,7 +129,7 @@ fn main() {
 	test_ptr_drop(mode);
 
 	println!("test_qhelp_tests:");
-	test_qhelp_tests();
+	test_qhelp_examples();
 
 	println!("test_vec_reserve:");
 	test_vec_reserve();