Skip to content

Commit 0728692

Browse files
committed
Rust: Add tests for functions as lambdas
1 parent b52fff2 commit 0728692

File tree

5 files changed

+91
-59
lines changed

5 files changed

+91
-59
lines changed

rust/ql/test/library-tests/dataflow/closures/inline-flow.expected

Lines changed: 0 additions & 50 deletions
This file was deleted.

rust/ql/test/library-tests/dataflow/closures/Cargo.lock renamed to rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock

File renamed without changes.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
models
2+
edges
3+
| main.rs:10:20:10:52 | if cond {...} else {...} | main.rs:11:10:11:16 | f(...) | provenance | |
4+
| main.rs:10:30:10:39 | source(...) | main.rs:10:20:10:52 | if cond {...} else {...} | provenance | |
5+
| main.rs:15:20:15:23 | ... | main.rs:17:18:17:21 | data | provenance | |
6+
| main.rs:22:9:22:9 | a | main.rs:23:13:23:13 | a | provenance | |
7+
| main.rs:22:13:22:22 | source(...) | main.rs:22:9:22:9 | a | provenance | |
8+
| main.rs:23:13:23:13 | a | main.rs:15:20:15:23 | ... | provenance | |
9+
| main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | provenance | |
10+
| main.rs:28:9:28:9 | a | main.rs:29:21:29:21 | a | provenance | |
11+
| main.rs:28:13:28:22 | source(...) | main.rs:28:9:28:9 | a | provenance | |
12+
| main.rs:29:9:29:9 | b | main.rs:30:10:30:10 | b | provenance | |
13+
| main.rs:29:13:29:22 | f(...) | main.rs:29:9:29:9 | b | provenance | |
14+
| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | provenance | |
15+
| main.rs:29:21:29:21 | a | main.rs:29:13:29:22 | f(...) | provenance | |
16+
| main.rs:37:16:37:25 | source(...) | main.rs:39:5:39:5 | [post] f [captured capt] | provenance | |
17+
| main.rs:39:5:39:5 | [post] f [captured capt] | main.rs:40:10:40:13 | capt | provenance | |
18+
| main.rs:39:5:39:5 | [post] f [captured capt] | main.rs:44:5:44:5 | g [captured capt] | provenance | |
19+
| main.rs:44:5:44:5 | g [captured capt] | main.rs:42:14:42:17 | capt | provenance | |
20+
nodes
21+
| main.rs:10:20:10:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
22+
| main.rs:10:30:10:39 | source(...) | semmle.label | source(...) |
23+
| main.rs:11:10:11:16 | f(...) | semmle.label | f(...) |
24+
| main.rs:15:20:15:23 | ... | semmle.label | ... |
25+
| main.rs:17:18:17:21 | data | semmle.label | data |
26+
| main.rs:22:9:22:9 | a | semmle.label | a |
27+
| main.rs:22:13:22:22 | source(...) | semmle.label | source(...) |
28+
| main.rs:23:13:23:13 | a | semmle.label | a |
29+
| main.rs:27:20:27:23 | ... | semmle.label | ... |
30+
| main.rs:27:26:27:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
31+
| main.rs:28:9:28:9 | a | semmle.label | a |
32+
| main.rs:28:13:28:22 | source(...) | semmle.label | source(...) |
33+
| main.rs:29:9:29:9 | b | semmle.label | b |
34+
| main.rs:29:13:29:22 | f(...) | semmle.label | f(...) |
35+
| main.rs:29:21:29:21 | a | semmle.label | a |
36+
| main.rs:30:10:30:10 | b | semmle.label | b |
37+
| main.rs:37:16:37:25 | source(...) | semmle.label | source(...) |
38+
| main.rs:39:5:39:5 | [post] f [captured capt] | semmle.label | [post] f [captured capt] |
39+
| main.rs:40:10:40:13 | capt | semmle.label | capt |
40+
| main.rs:42:14:42:17 | capt | semmle.label | capt |
41+
| main.rs:44:5:44:5 | g [captured capt] | semmle.label | g [captured capt] |
42+
subpaths
43+
| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | main.rs:29:13:29:22 | f(...) |
44+
testFailures
45+
#select
46+
| main.rs:11:10:11:16 | f(...) | main.rs:10:30:10:39 | source(...) | main.rs:11:10:11:16 | f(...) | $@ | main.rs:10:30:10:39 | source(...) | source(...) |
47+
| main.rs:17:18:17:21 | data | main.rs:22:13:22:22 | source(...) | main.rs:17:18:17:21 | data | $@ | main.rs:22:13:22:22 | source(...) | source(...) |
48+
| main.rs:30:10:30:10 | b | main.rs:28:13:28:22 | source(...) | main.rs:30:10:30:10 | b | $@ | main.rs:28:13:28:22 | source(...) | source(...) |
49+
| main.rs:40:10:40:13 | capt | main.rs:37:16:37:25 | source(...) | main.rs:40:10:40:13 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
50+
| main.rs:42:14:42:17 | capt | main.rs:37:16:37:25 | source(...) | main.rs:42:14:42:17 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |

rust/ql/test/library-tests/dataflow/closures/inline-flow.ql renamed to rust/ql/test/library-tests/dataflow/lambdas/inline-flow.ql

File renamed without changes.

rust/ql/test/library-tests/dataflow/closures/main.rs renamed to rust/ql/test/library-tests/dataflow/lambdas/main.rs

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,25 @@ fn sink(s: i64) {
66
println!("{}", s);
77
}
88

9-
109
fn closure_flow_out() {
1110
let f = |cond| if cond { source(92) } else { 0 };
1211
sink(f(true)); // $ hasValueFlow=92
1312
}
1413

1514
fn closure_flow_in() {
16-
let f = |cond, data|
15+
let f = |cond, data| {
1716
if cond {
1817
sink(data); // $ hasValueFlow=87
1918
} else {
2019
sink(0)
21-
};
20+
}
21+
};
2222
let a = source(87);
2323
f(true, a);
2424
}
2525

2626
fn closure_flow_through() {
27-
let f = |cond, data|
28-
if cond {
29-
data
30-
} else {
31-
0
32-
};
27+
let f = |cond, data| if cond { data } else { 0 };
3328
let a = source(43);
3429
let b = f(true, a);
3530
sink(b); // $ hasValueFlow=43
@@ -49,9 +44,46 @@ fn closure_captured_variable() {
4944
g();
5045
}
5146

47+
fn get_from_source() -> i64 {
48+
source(93)
49+
}
50+
51+
fn pass_to_sink(data: i64) {
52+
sink(data); // $ MISSING: hasValueFlow=34
53+
}
54+
55+
fn function_flow_out() {
56+
let f = get_from_source;
57+
sink(f()); // $ MISSING: hasValueFlow=93
58+
}
59+
60+
fn function_flow_in() {
61+
let f = pass_to_sink;
62+
let a = source(34);
63+
f(a);
64+
}
65+
66+
fn get_arg(cond: bool, data: i64) -> i64 {
67+
if cond {
68+
data
69+
} else {
70+
0
71+
}
72+
}
73+
74+
fn function_flows_through() {
75+
let f = get_arg;
76+
let a = source(56);
77+
let b = f(true, a);
78+
sink(b); // $ MISSING: hasValueFlow=56
79+
}
80+
5281
fn main() {
5382
closure_flow_out();
5483
closure_flow_in();
5584
closure_flow_through();
5685
closure_captured_variable();
86+
function_flow_in();
87+
function_flow_out();
88+
function_flows_through();
5789
}

0 commit comments

Comments
 (0)