Skip to content

Commit 5667901

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes after merge from main (which changed the path explanations).
1 parent a2d75c4 commit 5667901

File tree

11 files changed

+191
-191
lines changed

11 files changed

+191
-191
lines changed

‎cpp/ql/test/query-tests/Security/CWE/CWE-022/semmle/tests/TaintedPath.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
edges
22
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | (const char *)... |
33
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | (const char *)... |
4-
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | Argument 0 indirection |
5-
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | Argument 0 indirection |
64
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | fileName |
75
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | fileName |
6+
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | fileName indirection |
7+
| test.c:9:23:9:26 | argv | test.c:17:11:17:18 | fileName indirection |
88
nodes
99
| test.c:9:23:9:26 | argv | semmle.label | argv |
1010
| test.c:9:23:9:26 | argv | semmle.label | argv |
1111
| test.c:17:11:17:18 | (const char *)... | semmle.label | (const char *)... |
1212
| test.c:17:11:17:18 | (const char *)... | semmle.label | (const char *)... |
13-
| test.c:17:11:17:18 | Argument 0 indirection | semmle.label | Argument 0 indirection |
14-
| test.c:17:11:17:18 | Argument 0 indirection | semmle.label | Argument 0 indirection |
1513
| test.c:17:11:17:18 | fileName | semmle.label | fileName |
14+
| test.c:17:11:17:18 | fileName indirection | semmle.label | fileName indirection |
15+
| test.c:17:11:17:18 | fileName indirection | semmle.label | fileName indirection |
1616
#select
1717
| test.c:17:11:17:18 | fileName | test.c:9:23:9:26 | argv | test.c:17:11:17:18 | fileName | This argument to a file access function is derived from $@ and then passed to fopen(filename) | test.c:9:23:9:26 | argv | user input (argv) |

‎cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/CgiXss.expected‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
edges
22
| search.c:14:24:14:28 | *query | search.c:17:8:17:12 | (const char *)... |
3-
| search.c:14:24:14:28 | *query | search.c:17:8:17:12 | Argument 0 indirection |
43
| search.c:14:24:14:28 | *query | search.c:17:8:17:12 | query |
4+
| search.c:14:24:14:28 | *query | search.c:17:8:17:12 | query indirection |
55
| search.c:14:24:14:28 | query | search.c:17:8:17:12 | (const char *)... |
6-
| search.c:14:24:14:28 | query | search.c:17:8:17:12 | Argument 0 indirection |
76
| search.c:14:24:14:28 | query | search.c:17:8:17:12 | query |
87
| search.c:14:24:14:28 | query | search.c:17:8:17:12 | query |
9-
| search.c:22:24:22:28 | *query | search.c:23:39:23:43 | Argument 1 indirection |
8+
| search.c:14:24:14:28 | query | search.c:17:8:17:12 | query indirection |
109
| search.c:22:24:22:28 | *query | search.c:23:39:23:43 | query |
1110
| search.c:22:24:22:28 | *query | search.c:23:39:23:43 | query |
12-
| search.c:22:24:22:28 | query | search.c:23:39:23:43 | Argument 1 indirection |
11+
| search.c:22:24:22:28 | *query | search.c:23:39:23:43 | query indirection |
1312
| search.c:22:24:22:28 | query | search.c:23:39:23:43 | query |
1413
| search.c:22:24:22:28 | query | search.c:23:39:23:43 | query |
14+
| search.c:22:24:22:28 | query | search.c:23:39:23:43 | query indirection |
1515
| search.c:51:21:51:26 | call to getenv | search.c:55:5:55:15 | raw_query |
1616
| search.c:51:21:51:26 | call to getenv | search.c:55:5:55:15 | raw_query |
1717
| search.c:51:21:51:26 | call to getenv | search.c:55:17:55:25 | raw_query indirection |
@@ -29,18 +29,18 @@ nodes
2929
| search.c:14:24:14:28 | query | semmle.label | query |
3030
| search.c:17:8:17:12 | (const char *)... | semmle.label | (const char *)... |
3131
| search.c:17:8:17:12 | (const char *)... | semmle.label | (const char *)... |
32-
| search.c:17:8:17:12 | Argument 0 indirection | semmle.label | Argument 0 indirection |
33-
| search.c:17:8:17:12 | Argument 0 indirection | semmle.label | Argument 0 indirection |
3432
| search.c:17:8:17:12 | query | semmle.label | query |
3533
| search.c:17:8:17:12 | query | semmle.label | query |
3634
| search.c:17:8:17:12 | query | semmle.label | query |
35+
| search.c:17:8:17:12 | query indirection | semmle.label | query indirection |
36+
| search.c:17:8:17:12 | query indirection | semmle.label | query indirection |
3737
| search.c:22:24:22:28 | *query | semmle.label | *query |
3838
| search.c:22:24:22:28 | query | semmle.label | query |
39-
| search.c:23:39:23:43 | Argument 1 indirection | semmle.label | Argument 1 indirection |
40-
| search.c:23:39:23:43 | Argument 1 indirection | semmle.label | Argument 1 indirection |
4139
| search.c:23:39:23:43 | query | semmle.label | query |
4240
| search.c:23:39:23:43 | query | semmle.label | query |
4341
| search.c:23:39:23:43 | query | semmle.label | query |
42+
| search.c:23:39:23:43 | query indirection | semmle.label | query indirection |
43+
| search.c:23:39:23:43 | query indirection | semmle.label | query indirection |
4444
| search.c:51:21:51:26 | call to getenv | semmle.label | call to getenv |
4545
| search.c:51:21:51:26 | call to getenv | semmle.label | call to getenv |
4646
| search.c:55:5:55:15 | raw_query | semmle.label | raw_query |

‎cpp/ql/test/query-tests/Security/CWE/CWE-089/SqlTainted/SqlTainted.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
edges
22
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | (const char *)... |
33
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | (const char *)... |
4-
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | Argument 1 indirection |
5-
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | Argument 1 indirection |
64
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | query1 |
75
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | query1 |
6+
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | query1 indirection |
7+
| test.c:15:20:15:23 | argv | test.c:21:18:21:23 | query1 indirection |
88
nodes
99
| test.c:15:20:15:23 | argv | semmle.label | argv |
1010
| test.c:15:20:15:23 | argv | semmle.label | argv |
1111
| test.c:21:18:21:23 | (const char *)... | semmle.label | (const char *)... |
1212
| test.c:21:18:21:23 | (const char *)... | semmle.label | (const char *)... |
13-
| test.c:21:18:21:23 | Argument 1 indirection | semmle.label | Argument 1 indirection |
14-
| test.c:21:18:21:23 | Argument 1 indirection | semmle.label | Argument 1 indirection |
1513
| test.c:21:18:21:23 | query1 | semmle.label | query1 |
14+
| test.c:21:18:21:23 | query1 indirection | semmle.label | query1 indirection |
15+
| test.c:21:18:21:23 | query1 indirection | semmle.label | query1 indirection |
1616
#select
1717
| test.c:21:18:21:23 | query1 | test.c:15:20:15:23 | argv | test.c:21:18:21:23 | query1 | This argument to a SQL query function is derived from $@ and then passed to mysql_query(sqlArg) | test.c:15:20:15:23 | argv | user input (argv) |

‎cpp/ql/test/query-tests/Security/CWE/CWE-114/semmle/UncontrolledProcessOperation/UncontrolledProcessOperation.expected‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
edges
2-
| test.cpp:24:30:24:36 | *command | test.cpp:26:10:26:16 | Argument 0 indirection |
32
| test.cpp:24:30:24:36 | *command | test.cpp:26:10:26:16 | command |
43
| test.cpp:24:30:24:36 | *command | test.cpp:26:10:26:16 | command |
5-
| test.cpp:24:30:24:36 | command | test.cpp:26:10:26:16 | Argument 0 indirection |
4+
| test.cpp:24:30:24:36 | *command | test.cpp:26:10:26:16 | command indirection |
65
| test.cpp:24:30:24:36 | command | test.cpp:26:10:26:16 | command |
76
| test.cpp:24:30:24:36 | command | test.cpp:26:10:26:16 | command |
8-
| test.cpp:29:30:29:36 | *command | test.cpp:31:10:31:16 | Argument 0 indirection |
7+
| test.cpp:24:30:24:36 | command | test.cpp:26:10:26:16 | command indirection |
98
| test.cpp:29:30:29:36 | *command | test.cpp:31:10:31:16 | command |
109
| test.cpp:29:30:29:36 | *command | test.cpp:31:10:31:16 | command |
11-
| test.cpp:29:30:29:36 | command | test.cpp:31:10:31:16 | Argument 0 indirection |
10+
| test.cpp:29:30:29:36 | *command | test.cpp:31:10:31:16 | command indirection |
1211
| test.cpp:29:30:29:36 | command | test.cpp:31:10:31:16 | command |
1312
| test.cpp:29:30:29:36 | command | test.cpp:31:10:31:16 | command |
13+
| test.cpp:29:30:29:36 | command | test.cpp:31:10:31:16 | command indirection |
1414
| test.cpp:42:7:42:16 | call to getenv | test.cpp:24:30:24:36 | command |
1515
| test.cpp:42:18:42:23 | call to getenv | test.cpp:42:7:42:16 | call to getenv |
1616
| test.cpp:42:18:42:23 | call to getenv | test.cpp:42:18:42:34 | call to getenv indirection |
@@ -24,44 +24,44 @@ edges
2424
| test.cpp:43:18:43:34 | (const char *)... | test.cpp:43:18:43:34 | call to getenv indirection |
2525
| test.cpp:43:18:43:34 | call to getenv indirection | test.cpp:29:30:29:36 | *command |
2626
| test.cpp:56:12:56:17 | buffer | test.cpp:62:10:62:15 | (const char *)... |
27-
| test.cpp:56:12:56:17 | buffer | test.cpp:62:10:62:15 | Argument 0 indirection |
2827
| test.cpp:56:12:56:17 | buffer | test.cpp:62:10:62:15 | buffer |
28+
| test.cpp:56:12:56:17 | buffer | test.cpp:62:10:62:15 | buffer indirection |
2929
| test.cpp:56:12:56:17 | buffer | test.cpp:63:10:63:13 | (const char *)... |
30-
| test.cpp:56:12:56:17 | buffer | test.cpp:63:10:63:13 | Argument 0 indirection |
3130
| test.cpp:56:12:56:17 | buffer | test.cpp:63:10:63:13 | data |
31+
| test.cpp:56:12:56:17 | buffer | test.cpp:63:10:63:13 | data indirection |
3232
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:62:10:62:15 | (const char *)... |
33-
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:62:10:62:15 | Argument 0 indirection |
3433
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:62:10:62:15 | buffer |
34+
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:62:10:62:15 | buffer indirection |
3535
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:63:10:63:13 | (const char *)... |
36-
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:63:10:63:13 | Argument 0 indirection |
3736
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:63:10:63:13 | data |
37+
| test.cpp:56:12:56:17 | fgets output argument | test.cpp:63:10:63:13 | data indirection |
3838
| test.cpp:76:12:76:17 | buffer | test.cpp:78:10:78:15 | (const char *)... |
39-
| test.cpp:76:12:76:17 | buffer | test.cpp:78:10:78:15 | Argument 0 indirection |
4039
| test.cpp:76:12:76:17 | buffer | test.cpp:78:10:78:15 | buffer |
40+
| test.cpp:76:12:76:17 | buffer | test.cpp:78:10:78:15 | buffer indirection |
4141
| test.cpp:76:12:76:17 | buffer | test.cpp:79:10:79:13 | (const char *)... |
42-
| test.cpp:76:12:76:17 | buffer | test.cpp:79:10:79:13 | Argument 0 indirection |
4342
| test.cpp:76:12:76:17 | buffer | test.cpp:79:10:79:13 | data |
43+
| test.cpp:76:12:76:17 | buffer | test.cpp:79:10:79:13 | data indirection |
4444
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:78:10:78:15 | (const char *)... |
45-
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:78:10:78:15 | Argument 0 indirection |
4645
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:78:10:78:15 | buffer |
46+
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:78:10:78:15 | buffer indirection |
4747
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:79:10:79:13 | (const char *)... |
48-
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:79:10:79:13 | Argument 0 indirection |
4948
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:79:10:79:13 | data |
49+
| test.cpp:76:12:76:17 | fgets output argument | test.cpp:79:10:79:13 | data indirection |
5050
nodes
5151
| test.cpp:24:30:24:36 | *command | semmle.label | *command |
5252
| test.cpp:24:30:24:36 | command | semmle.label | command |
53-
| test.cpp:26:10:26:16 | Argument 0 indirection | semmle.label | Argument 0 indirection |
54-
| test.cpp:26:10:26:16 | Argument 0 indirection | semmle.label | Argument 0 indirection |
5553
| test.cpp:26:10:26:16 | command | semmle.label | command |
5654
| test.cpp:26:10:26:16 | command | semmle.label | command |
5755
| test.cpp:26:10:26:16 | command | semmle.label | command |
56+
| test.cpp:26:10:26:16 | command indirection | semmle.label | command indirection |
57+
| test.cpp:26:10:26:16 | command indirection | semmle.label | command indirection |
5858
| test.cpp:29:30:29:36 | *command | semmle.label | *command |
5959
| test.cpp:29:30:29:36 | command | semmle.label | command |
60-
| test.cpp:31:10:31:16 | Argument 0 indirection | semmle.label | Argument 0 indirection |
61-
| test.cpp:31:10:31:16 | Argument 0 indirection | semmle.label | Argument 0 indirection |
6260
| test.cpp:31:10:31:16 | command | semmle.label | command |
6361
| test.cpp:31:10:31:16 | command | semmle.label | command |
6462
| test.cpp:31:10:31:16 | command | semmle.label | command |
63+
| test.cpp:31:10:31:16 | command indirection | semmle.label | command indirection |
64+
| test.cpp:31:10:31:16 | command indirection | semmle.label | command indirection |
6565
| test.cpp:42:7:42:16 | call to getenv | semmle.label | call to getenv |
6666
| test.cpp:42:18:42:23 | call to getenv | semmle.label | call to getenv |
6767
| test.cpp:42:18:42:34 | (const char *)... | semmle.label | (const char *)... |
@@ -74,26 +74,26 @@ nodes
7474
| test.cpp:56:12:56:17 | fgets output argument | semmle.label | fgets output argument |
7575
| test.cpp:62:10:62:15 | (const char *)... | semmle.label | (const char *)... |
7676
| test.cpp:62:10:62:15 | (const char *)... | semmle.label | (const char *)... |
77-
| test.cpp:62:10:62:15 | Argument 0 indirection | semmle.label | Argument 0 indirection |
78-
| test.cpp:62:10:62:15 | Argument 0 indirection | semmle.label | Argument 0 indirection |
7977
| test.cpp:62:10:62:15 | buffer | semmle.label | buffer |
78+
| test.cpp:62:10:62:15 | buffer indirection | semmle.label | buffer indirection |
79+
| test.cpp:62:10:62:15 | buffer indirection | semmle.label | buffer indirection |
8080
| test.cpp:63:10:63:13 | (const char *)... | semmle.label | (const char *)... |
8181
| test.cpp:63:10:63:13 | (const char *)... | semmle.label | (const char *)... |
82-
| test.cpp:63:10:63:13 | Argument 0 indirection | semmle.label | Argument 0 indirection |
83-
| test.cpp:63:10:63:13 | Argument 0 indirection | semmle.label | Argument 0 indirection |
8482
| test.cpp:63:10:63:13 | data | semmle.label | data |
83+
| test.cpp:63:10:63:13 | data indirection | semmle.label | data indirection |
84+
| test.cpp:63:10:63:13 | data indirection | semmle.label | data indirection |
8585
| test.cpp:76:12:76:17 | buffer | semmle.label | buffer |
8686
| test.cpp:76:12:76:17 | fgets output argument | semmle.label | fgets output argument |
8787
| test.cpp:78:10:78:15 | (const char *)... | semmle.label | (const char *)... |
8888
| test.cpp:78:10:78:15 | (const char *)... | semmle.label | (const char *)... |
89-
| test.cpp:78:10:78:15 | Argument 0 indirection | semmle.label | Argument 0 indirection |
90-
| test.cpp:78:10:78:15 | Argument 0 indirection | semmle.label | Argument 0 indirection |
9189
| test.cpp:78:10:78:15 | buffer | semmle.label | buffer |
90+
| test.cpp:78:10:78:15 | buffer indirection | semmle.label | buffer indirection |
91+
| test.cpp:78:10:78:15 | buffer indirection | semmle.label | buffer indirection |
9292
| test.cpp:79:10:79:13 | (const char *)... | semmle.label | (const char *)... |
9393
| test.cpp:79:10:79:13 | (const char *)... | semmle.label | (const char *)... |
94-
| test.cpp:79:10:79:13 | Argument 0 indirection | semmle.label | Argument 0 indirection |
95-
| test.cpp:79:10:79:13 | Argument 0 indirection | semmle.label | Argument 0 indirection |
9694
| test.cpp:79:10:79:13 | data | semmle.label | data |
95+
| test.cpp:79:10:79:13 | data indirection | semmle.label | data indirection |
96+
| test.cpp:79:10:79:13 | data indirection | semmle.label | data indirection |
9797
#select
9898
| test.cpp:26:10:26:16 | command | test.cpp:42:18:42:23 | call to getenv | test.cpp:26:10:26:16 | command | The value of this argument may come from $@ and is being passed to system | test.cpp:42:18:42:23 | call to getenv | call to getenv |
9999
| test.cpp:31:10:31:16 | command | test.cpp:43:18:43:23 | call to getenv | test.cpp:31:10:31:16 | command | The value of this argument may come from $@ and is being passed to system | test.cpp:43:18:43:23 | call to getenv | call to getenv |

0 commit comments

Comments
 (0)