Skip to content

Commit 0195e2e

Browse files
geoffw0geoffw0
committed
Rust: Accept changes to .expected from previous commit and merge.
1 parent 8b153a1 commit 0195e2e

4 files changed

Lines changed: 75 additions & 61 deletions

File tree

‎rust/ql/test/library-tests/format-macros-legacy/FormatArgs.expected‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
| main.rs:13:10:13:25 | FormatArgsExpr | 1 |
2-
| main.rs:16:10:16:23 | FormatArgsExpr | 0 |
3-
| main.rs:19:13:19:36 | FormatArgsExpr | 1 |
1+
| main.rs:13:18:13:24 | FormatArgsExpr | 1 |
2+
| main.rs:16:18:16:22 | FormatArgsExpr | 0 |
3+
| main.rs:19:21:19:35 | FormatArgsExpr | 1 |
44
| main.rs:27:25:27:33 | FormatArgsExpr | 1 |
55
| main.rs:38:40:38:46 | FormatArgsExpr | 0 |
66
| main.rs:43:52:43:58 | FormatArgsExpr | 0 |
7-
| main.rs:49:13:49:33 | FormatArgsExpr | 1 |
8-
| main.rs:54:13:54:33 | FormatArgsExpr | 0 |
9-
| main.rs:64:5:64:27 | FormatArgsExpr | 1 |
10-
| main.rs:65:5:65:26 | FormatArgsExpr | 0 |
11-
| main.rs:66:5:66:25 | FormatArgsExpr | 1 |
12-
| main.rs:67:5:67:24 | FormatArgsExpr | 0 |
7+
| main.rs:49:26:49:32 | FormatArgsExpr | 1 |
8+
| main.rs:54:28:54:32 | FormatArgsExpr | 0 |
9+
| main.rs:64:14:64:26 | FormatArgsExpr | 1 |
10+
| main.rs:65:15:65:25 | FormatArgsExpr | 0 |
11+
| main.rs:66:12:66:24 | FormatArgsExpr | 1 |
12+
| main.rs:67:13:67:23 | FormatArgsExpr | 0 |

‎rust/ql/test/library-tests/format-macros-legacy/LogInjection.expected‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#select
2-
| main.rs:64:5:64:27 | FormatArgsExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:64:5:64:27 | FormatArgsExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
3-
| main.rs:65:5:65:26 | FormatArgsExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:65:5:65:26 | FormatArgsExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
4-
| main.rs:66:5:66:25 | FormatArgsExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:66:5:66:25 | FormatArgsExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
5-
| main.rs:67:5:67:24 | FormatArgsExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:67:5:67:24 | FormatArgsExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
2+
| main.rs:64:14:64:26 | MacroExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:64:14:64:26 | MacroExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
3+
| main.rs:65:15:65:25 | MacroExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:65:15:65:25 | MacroExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
4+
| main.rs:66:12:66:24 | MacroExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:66:12:66:24 | MacroExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
5+
| main.rs:67:13:67:23 | MacroExpr | main.rs:62:19:62:45 | ...::var(...) | main.rs:67:13:67:23 | MacroExpr | Log entry depends on a $@. | main.rs:62:19:62:45 | ...::var(...) | user-provided value |
66
edges
7-
| main.rs:62:9:62:15 | tainted | main.rs:64:5:64:27 | FormatArgsExpr | provenance | Sink:MaD:2 |
8-
| main.rs:62:9:62:15 | tainted | main.rs:65:5:65:26 | FormatArgsExpr | provenance | Sink:MaD:1 |
9-
| main.rs:62:9:62:15 | tainted | main.rs:66:5:66:25 | FormatArgsExpr | provenance | Sink:MaD:2 |
10-
| main.rs:62:9:62:15 | tainted | main.rs:67:5:67:24 | FormatArgsExpr | provenance | Sink:MaD:1 |
7+
| main.rs:62:9:62:15 | tainted | main.rs:64:14:64:26 | MacroExpr | provenance | Sink:MaD:2 |
8+
| main.rs:62:9:62:15 | tainted | main.rs:65:15:65:25 | MacroExpr | provenance | Sink:MaD:1 |
9+
| main.rs:62:9:62:15 | tainted | main.rs:66:12:66:24 | MacroExpr | provenance | Sink:MaD:2 |
10+
| main.rs:62:9:62:15 | tainted | main.rs:67:13:67:23 | MacroExpr | provenance | Sink:MaD:1 |
1111
| main.rs:62:19:62:45 | ...::var(...) | main.rs:62:19:62:45 | ...::var(...) [Ok] | provenance | Src:MaD:3 |
1212
| main.rs:62:19:62:45 | ...::var(...) [Ok] | main.rs:62:19:62:65 | ... .unwrap_or_default() | provenance | MaD:4 |
1313
| main.rs:62:19:62:65 | ... .unwrap_or_default() | main.rs:62:9:62:15 | tainted | provenance | |
@@ -21,8 +21,8 @@ nodes
2121
| main.rs:62:19:62:45 | ...::var(...) | semmle.label | ...::var(...) |
2222
| main.rs:62:19:62:45 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
2323
| main.rs:62:19:62:65 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
24-
| main.rs:64:5:64:27 | FormatArgsExpr | semmle.label | FormatArgsExpr |
25-
| main.rs:65:5:65:26 | FormatArgsExpr | semmle.label | FormatArgsExpr |
26-
| main.rs:66:5:66:25 | FormatArgsExpr | semmle.label | FormatArgsExpr |
27-
| main.rs:67:5:67:24 | FormatArgsExpr | semmle.label | FormatArgsExpr |
24+
| main.rs:64:14:64:26 | MacroExpr | semmle.label | MacroExpr |
25+
| main.rs:65:15:65:25 | MacroExpr | semmle.label | MacroExpr |
26+
| main.rs:66:12:66:24 | MacroExpr | semmle.label | MacroExpr |
27+
| main.rs:67:13:67:23 | MacroExpr | semmle.label | MacroExpr |
2828
subpaths

‎rust/ql/test/library-tests/format-macros-legacy/inline-taint-flow.expected‎

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,80 @@
11
models
2-
| 1 | Summary: <_ as core::fmt::Write>::write_fmt; Argument[0]; Argument[self].Reference; taint |
3-
| 2 | Summary: <_ as core::fmt::Write>::write_str; Argument[0].Reference; Argument[self].Reference; taint |
4-
| 3 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
5-
| 4 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
2+
| 1 | Summary: <alloc::string::String>::as_str; Argument[self].Reference; ReturnValue.Reference; taint |
3+
| 2 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
4+
| 3 | Summary: core::fmt::Write::write_fmt; Argument[0]; Argument[self].Reference; taint |
5+
| 4 | Summary: core::fmt::Write::write_str; Argument[0].Reference; Argument[self].Reference; taint |
66
| 5 | Summary: core::fmt::write; Argument[1]; Argument[0].Reference; taint |
7+
| 6 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
78
edges
8-
| main.rs:12:9:12:9 | a | main.rs:13:10:13:25 | FormatArgsExpr | provenance | |
9+
| main.rs:12:9:12:9 | a | main.rs:13:18:13:24 | MacroExpr | provenance | |
910
| main.rs:12:13:12:21 | source(...) | main.rs:12:9:12:9 | a | provenance | |
10-
| main.rs:13:10:13:25 | ...::format(...) | main.rs:13:10:13:25 | MacroExpr | provenance | |
11-
| main.rs:13:10:13:25 | FormatArgsExpr | main.rs:13:10:13:25 | ...::format(...) | provenance | MaD:4 |
12-
| main.rs:15:9:15:9 | b | main.rs:16:10:16:23 | FormatArgsExpr | provenance | |
11+
| main.rs:13:18:13:24 | ...::format(...) | main.rs:13:18:13:24 | { ... } | provenance | |
12+
| main.rs:13:18:13:24 | ...::must_use(...) | main.rs:13:10:13:25 | MacroExpr | provenance | |
13+
| main.rs:13:18:13:24 | MacroExpr | main.rs:13:18:13:24 | ...::format(...) | provenance | MaD:2 |
14+
| main.rs:13:18:13:24 | { ... } | main.rs:13:18:13:24 | ...::must_use(...) | provenance | MaD:6 |
15+
| main.rs:15:9:15:9 | b | main.rs:16:18:16:22 | MacroExpr | provenance | |
1316
| main.rs:15:13:15:21 | source(...) | main.rs:15:9:15:9 | b | provenance | |
14-
| main.rs:16:10:16:23 | ...::format(...) | main.rs:16:10:16:23 | MacroExpr | provenance | |
15-
| main.rs:16:10:16:23 | FormatArgsExpr | main.rs:16:10:16:23 | ...::format(...) | provenance | MaD:4 |
16-
| main.rs:18:9:18:9 | c | main.rs:19:13:19:36 | FormatArgsExpr | provenance | |
17+
| main.rs:16:18:16:22 | ...::format(...) | main.rs:16:18:16:22 | { ... } | provenance | |
18+
| main.rs:16:18:16:22 | ...::must_use(...) | main.rs:16:10:16:23 | MacroExpr | provenance | |
19+
| main.rs:16:18:16:22 | MacroExpr | main.rs:16:18:16:22 | ...::format(...) | provenance | MaD:2 |
20+
| main.rs:16:18:16:22 | { ... } | main.rs:16:18:16:22 | ...::must_use(...) | provenance | MaD:6 |
21+
| main.rs:18:9:18:9 | c | main.rs:19:21:19:35 | MacroExpr | provenance | |
1722
| main.rs:18:13:18:21 | source(...) | main.rs:18:9:18:9 | c | provenance | |
1823
| main.rs:19:9:19:9 | s | main.rs:20:10:20:10 | s | provenance | |
19-
| main.rs:19:13:19:36 | ...::format(...) | main.rs:19:9:19:9 | s | provenance | |
20-
| main.rs:19:13:19:36 | FormatArgsExpr | main.rs:19:13:19:36 | ...::format(...) | provenance | MaD:4 |
24+
| main.rs:19:21:19:35 | ...::format(...) | main.rs:19:21:19:35 | { ... } | provenance | |
25+
| main.rs:19:21:19:35 | ...::must_use(...) | main.rs:19:9:19:9 | s | provenance | |
26+
| main.rs:19:21:19:35 | MacroExpr | main.rs:19:21:19:35 | ...::format(...) | provenance | MaD:2 |
27+
| main.rs:19:21:19:35 | { ... } | main.rs:19:21:19:35 | ...::must_use(...) | provenance | MaD:6 |
2128
| main.rs:26:9:26:9 | a | main.rs:27:9:27:9 | b | provenance | |
2229
| main.rs:26:13:26:21 | source(...) | main.rs:26:9:26:9 | a | provenance | |
2330
| main.rs:27:9:27:9 | b | main.rs:28:30:28:30 | b | provenance | |
2431
| main.rs:28:9:28:9 | c | main.rs:29:10:29:10 | c | provenance | |
2532
| main.rs:28:13:28:31 | ...::format(...) | main.rs:28:9:28:9 | c | provenance | |
26-
| main.rs:28:30:28:30 | b | main.rs:28:13:28:31 | ...::format(...) | provenance | MaD:4 |
33+
| main.rs:28:30:28:30 | b | main.rs:28:13:28:31 | ...::format(...) | provenance | MaD:2 |
2734
| main.rs:32:9:32:9 | d | main.rs:33:28:33:28 | d | provenance | |
2835
| main.rs:32:13:32:21 | source(...) | main.rs:32:9:32:9 | d | provenance | |
2936
| main.rs:33:13:33:16 | [post] buf1 | main.rs:34:10:34:13 | buf1 | provenance | |
30-
| main.rs:33:28:33:28 | d | main.rs:33:28:33:37 | d.as_str() [&ref] | provenance | MaD:3 |
31-
| main.rs:33:28:33:37 | d.as_str() [&ref] | main.rs:33:13:33:16 | [post] buf1 | provenance | MaD:2 |
37+
| main.rs:33:28:33:28 | d | main.rs:33:28:33:37 | d.as_str() [&ref] | provenance | MaD:1 |
38+
| main.rs:33:28:33:37 | d.as_str() [&ref] | main.rs:33:13:33:16 | [post] buf1 | provenance | MaD:4 |
3239
| main.rs:37:9:37:9 | e | main.rs:38:28:38:46 | MacroExpr | provenance | |
3340
| main.rs:37:13:37:21 | source(...) | main.rs:37:9:37:9 | e | provenance | |
3441
| main.rs:38:13:38:16 | [post] buf2 | main.rs:39:10:39:13 | buf2 | provenance | |
35-
| main.rs:38:28:38:46 | MacroExpr | main.rs:38:13:38:16 | [post] buf2 | provenance | MaD:1 |
42+
| main.rs:38:28:38:46 | MacroExpr | main.rs:38:13:38:16 | [post] buf2 | provenance | MaD:3 |
3643
| main.rs:42:9:42:9 | f | main.rs:43:40:43:58 | MacroExpr | provenance | |
3744
| main.rs:42:13:42:21 | source(...) | main.rs:42:9:42:9 | f | provenance | |
3845
| main.rs:43:29:43:37 | [post] &mut buf3 [&ref] | main.rs:43:34:43:37 | [post] buf3 | provenance | |
3946
| main.rs:43:34:43:37 | [post] buf3 | main.rs:44:10:44:13 | buf3 | provenance | |
4047
| main.rs:43:40:43:58 | MacroExpr | main.rs:43:29:43:37 | [post] &mut buf3 [&ref] | provenance | MaD:5 |
41-
| main.rs:48:9:48:9 | g | main.rs:49:13:49:33 | FormatArgsExpr | provenance | |
48+
| main.rs:48:9:48:9 | g | main.rs:49:26:49:32 | MacroExpr | provenance | |
4249
| main.rs:48:13:48:21 | source(...) | main.rs:48:9:48:9 | g | provenance | |
43-
| main.rs:49:13:49:33 | FormatArgsExpr | main.rs:49:20:49:23 | [post] buf4 | provenance | MaD:1 |
4450
| main.rs:49:20:49:23 | [post] buf4 | main.rs:50:10:50:13 | buf4 | provenance | |
45-
| main.rs:53:9:53:9 | h | main.rs:54:13:54:33 | FormatArgsExpr | provenance | |
51+
| main.rs:49:26:49:32 | MacroExpr | main.rs:49:20:49:23 | [post] buf4 | provenance | MaD:3 |
52+
| main.rs:53:9:53:9 | h | main.rs:54:28:54:32 | MacroExpr | provenance | |
4653
| main.rs:53:13:53:21 | source(...) | main.rs:53:9:53:9 | h | provenance | |
47-
| main.rs:54:13:54:33 | FormatArgsExpr | main.rs:54:22:54:25 | [post] buf5 | provenance | MaD:1 |
4854
| main.rs:54:22:54:25 | [post] buf5 | main.rs:55:10:55:13 | buf5 | provenance | |
55+
| main.rs:54:28:54:32 | MacroExpr | main.rs:54:22:54:25 | [post] buf5 | provenance | MaD:3 |
4956
nodes
5057
| main.rs:12:9:12:9 | a | semmle.label | a |
5158
| main.rs:12:13:12:21 | source(...) | semmle.label | source(...) |
52-
| main.rs:13:10:13:25 | ...::format(...) | semmle.label | ...::format(...) |
53-
| main.rs:13:10:13:25 | FormatArgsExpr | semmle.label | FormatArgsExpr |
5459
| main.rs:13:10:13:25 | MacroExpr | semmle.label | MacroExpr |
60+
| main.rs:13:18:13:24 | ...::format(...) | semmle.label | ...::format(...) |
61+
| main.rs:13:18:13:24 | ...::must_use(...) | semmle.label | ...::must_use(...) |
62+
| main.rs:13:18:13:24 | MacroExpr | semmle.label | MacroExpr |
63+
| main.rs:13:18:13:24 | { ... } | semmle.label | { ... } |
5564
| main.rs:15:9:15:9 | b | semmle.label | b |
5665
| main.rs:15:13:15:21 | source(...) | semmle.label | source(...) |
57-
| main.rs:16:10:16:23 | ...::format(...) | semmle.label | ...::format(...) |
58-
| main.rs:16:10:16:23 | FormatArgsExpr | semmle.label | FormatArgsExpr |
5966
| main.rs:16:10:16:23 | MacroExpr | semmle.label | MacroExpr |
67+
| main.rs:16:18:16:22 | ...::format(...) | semmle.label | ...::format(...) |
68+
| main.rs:16:18:16:22 | ...::must_use(...) | semmle.label | ...::must_use(...) |
69+
| main.rs:16:18:16:22 | MacroExpr | semmle.label | MacroExpr |
70+
| main.rs:16:18:16:22 | { ... } | semmle.label | { ... } |
6071
| main.rs:18:9:18:9 | c | semmle.label | c |
6172
| main.rs:18:13:18:21 | source(...) | semmle.label | source(...) |
6273
| main.rs:19:9:19:9 | s | semmle.label | s |
63-
| main.rs:19:13:19:36 | ...::format(...) | semmle.label | ...::format(...) |
64-
| main.rs:19:13:19:36 | FormatArgsExpr | semmle.label | FormatArgsExpr |
74+
| main.rs:19:21:19:35 | ...::format(...) | semmle.label | ...::format(...) |
75+
| main.rs:19:21:19:35 | ...::must_use(...) | semmle.label | ...::must_use(...) |
76+
| main.rs:19:21:19:35 | MacroExpr | semmle.label | MacroExpr |
77+
| main.rs:19:21:19:35 | { ... } | semmle.label | { ... } |
6578
| main.rs:20:10:20:10 | s | semmle.label | s |
6679
| main.rs:26:9:26:9 | a | semmle.label | a |
6780
| main.rs:26:13:26:21 | source(...) | semmle.label | source(...) |
@@ -89,13 +102,13 @@ nodes
89102
| main.rs:44:10:44:13 | buf3 | semmle.label | buf3 |
90103
| main.rs:48:9:48:9 | g | semmle.label | g |
91104
| main.rs:48:13:48:21 | source(...) | semmle.label | source(...) |
92-
| main.rs:49:13:49:33 | FormatArgsExpr | semmle.label | FormatArgsExpr |
93105
| main.rs:49:20:49:23 | [post] buf4 | semmle.label | [post] buf4 |
106+
| main.rs:49:26:49:32 | MacroExpr | semmle.label | MacroExpr |
94107
| main.rs:50:10:50:13 | buf4 | semmle.label | buf4 |
95108
| main.rs:53:9:53:9 | h | semmle.label | h |
96109
| main.rs:53:13:53:21 | source(...) | semmle.label | source(...) |
97-
| main.rs:54:13:54:33 | FormatArgsExpr | semmle.label | FormatArgsExpr |
98110
| main.rs:54:22:54:25 | [post] buf5 | semmle.label | [post] buf5 |
111+
| main.rs:54:28:54:32 | MacroExpr | semmle.label | MacroExpr |
99112
| main.rs:55:10:55:13 | buf5 | semmle.label | buf5 |
100113
subpaths
101114
testFailures

0 commit comments

Comments
 (0)