Skip to content

Commit b82a7ab

Browse files
committed
Rust: Update variable name in examples.
1 parent 36cf4b6 commit b82a7ab

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

rust/ql/src/queries/security/CWE-825/AccessAfterLifetimeBad.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ fn get_pointer() -> *const i64 {
77

88
fn example() {
99
let ptr = get_pointer();
10-
let val;
10+
let dereferenced_ptr;
1111

1212
// ...
1313

1414
unsafe {
15-
val = *ptr; // BAD: dereferences `ptr` after the lifetime of `val` has ended
15+
dereferenced_ptr = *ptr; // BAD: dereferences `ptr` after the lifetime of `val` has ended
1616
}
1717

1818
// ...

rust/ql/src/queries/security/CWE-825/AccessAfterLifetimeGood.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ fn get_box() -> Box<i64> {
77

88
fn example() {
99
let ptr = get_box();
10-
let val;
10+
let dereferenced_ptr;
1111

1212
// ...
1313

14-
val = *ptr; // GOOD
14+
dereferenced_ptr = *ptr; // GOOD
1515

1616
// ...
1717
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
| lifetime.rs:667:14:667:17 | ref1 | lifetime.rs:654:31:654:35 | &str1 | lifetime.rs:667:14:667:17 | ref1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:653:8:653:11 | str1 | str1 |
2323
| lifetime.rs:667:14:667:17 | ref1 | lifetime.rs:655:11:655:25 | &raw const str2 | lifetime.rs:667:14:667:17 | ref1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:651:7:651:10 | str2 | str2 |
2424
| lifetime.rs:789:12:789:13 | p1 | lifetime.rs:781:9:781:19 | &my_local10 | lifetime.rs:789:12:789:13 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:779:6:779:15 | my_local10 | my_local10 |
25-
| lifetime.rs:808:10:808:12 | ptr | lifetime.rs:798:9:798:12 | &val | lifetime.rs:808:10:808:12 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:796:6:796:8 | val | val |
25+
| lifetime.rs:808:23:808:25 | ptr | lifetime.rs:798:9:798:12 | &val | lifetime.rs:808:23:808:25 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:796:6:796:8 | val | val |
2626
edges
2727
| deallocation.rs:148:6:148:7 | p1 | deallocation.rs:151:14:151:15 | p1 | provenance | |
2828
| deallocation.rs:148:6:148:7 | p1 | deallocation.rs:158:14:158:15 | p1 | provenance | |
@@ -201,7 +201,7 @@ edges
201201
| lifetime.rs:785:11:785:41 | get_local_for_unsafe_function(...) | lifetime.rs:785:6:785:7 | p1 | provenance | |
202202
| lifetime.rs:798:2:798:12 | return ... | lifetime.rs:802:12:802:24 | get_pointer(...) | provenance | |
203203
| lifetime.rs:798:9:798:12 | &val | lifetime.rs:798:2:798:12 | return ... | provenance | |
204-
| lifetime.rs:802:6:802:8 | ptr | lifetime.rs:808:10:808:12 | ptr | provenance | |
204+
| lifetime.rs:802:6:802:8 | ptr | lifetime.rs:808:23:808:25 | ptr | provenance | |
205205
| lifetime.rs:802:12:802:24 | get_pointer(...) | lifetime.rs:802:6:802:8 | ptr | provenance | |
206206
models
207207
| 1 | Summary: lang:core; crate::ptr::from_ref; Argument[0]; ReturnValue; value |
@@ -418,5 +418,5 @@ nodes
418418
| lifetime.rs:798:9:798:12 | &val | semmle.label | &val |
419419
| lifetime.rs:802:6:802:8 | ptr | semmle.label | ptr |
420420
| lifetime.rs:802:12:802:24 | get_pointer(...) | semmle.label | get_pointer(...) |
421-
| lifetime.rs:808:10:808:12 | ptr | semmle.label | ptr |
421+
| lifetime.rs:808:23:808:25 | ptr | semmle.label | ptr |
422422
subpaths

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -800,15 +800,15 @@ fn get_pointer() -> *const i64 {
800800

801801
pub fn test_lifetimes_example_bad() {
802802
let ptr = get_pointer();
803-
let val;
803+
let dereferenced_ptr;
804804

805805
use_the_stack();
806806

807807
unsafe {
808-
val = *ptr; // $ Alert[rust/access-after-lifetime-ended]=val
808+
dereferenced_ptr = *ptr; // $ Alert[rust/access-after-lifetime-ended]=val
809809
}
810810

811-
println!(" val = {val} (!)"); // corrupt in practice
811+
println!(" val = {dereferenced_ptr} (!)"); // corrupt in practice
812812
}
813813

814814
fn get_box() -> Box<i64> {
@@ -819,11 +819,11 @@ fn get_box() -> Box<i64> {
819819

820820
pub fn test_lifetimes_example_good() {
821821
let ptr = get_box();
822-
let val;
822+
let dereferenced_ptr;
823823

824824
use_the_stack();
825825

826-
val = *ptr; // GOOD
826+
dereferenced_ptr = *ptr; // GOOD
827827

828-
println!(" val = {val}");
828+
println!(" val = {dereferenced_ptr}");
829829
}

0 commit comments

Comments
 (0)