Skip to content

Commit 2a6ba40

Browse files
author
Robert Marsh
committed
C++: Accept more test changes
1 parent 04ad94d commit 2a6ba40

4 files changed

Lines changed: 72 additions & 72 deletions

File tree

‎cpp/ql/test/library-tests/dataflow/security-taint/tainted_diff.expected‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,44 @@
1+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:8:24:8:25 | s1 | AST only |
2+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:23:14:23:19 | envStr | AST only |
3+
| test.cpp:38:23:38:28 | call to getenv | test.cpp:8:24:8:25 | s1 | AST only |
4+
| test.cpp:38:23:38:28 | call to getenv | test.cpp:38:14:38:19 | envStr | AST only |
5+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:8:24:8:25 | s1 | AST only |
6+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:45:13:45:24 | envStrGlobal | AST only |
7+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:49:14:49:19 | envStr | AST only |
18
| test.cpp:49:23:49:28 | call to getenv | test.cpp:50:15:50:24 | envStr_ptr | AST only |
29
| test.cpp:49:23:49:28 | call to getenv | test.cpp:50:28:50:40 | & ... | AST only |
310
| test.cpp:49:23:49:28 | call to getenv | test.cpp:50:29:50:40 | envStrGlobal | AST only |
411
| test.cpp:49:23:49:28 | call to getenv | test.cpp:52:2:52:12 | * ... | AST only |
512
| test.cpp:49:23:49:28 | call to getenv | test.cpp:52:3:52:12 | envStr_ptr | AST only |
13+
| test.cpp:60:29:60:34 | call to getenv | test.cpp:10:27:10:27 | s | AST only |
14+
| test.cpp:60:29:60:34 | call to getenv | test.cpp:60:18:60:25 | userName | AST only |
615
| test.cpp:68:28:68:33 | call to getenv | test.cpp:11:20:11:21 | s1 | AST only |
16+
| test.cpp:68:28:68:33 | call to getenv | test.cpp:11:36:11:37 | s2 | AST only |
717
| test.cpp:68:28:68:33 | call to getenv | test.cpp:67:7:67:13 | copying | AST only |
18+
| test.cpp:68:28:68:33 | call to getenv | test.cpp:68:17:68:24 | userName | AST only |
819
| test.cpp:68:28:68:33 | call to getenv | test.cpp:69:10:69:13 | copy | AST only |
20+
| test.cpp:68:28:68:33 | call to getenv | test.cpp:70:5:70:10 | call to strcpy | AST only |
921
| test.cpp:68:28:68:33 | call to getenv | test.cpp:70:12:70:15 | copy | AST only |
1022
| test.cpp:68:28:68:33 | call to getenv | test.cpp:71:12:71:15 | copy | AST only |
23+
| test.cpp:75:20:75:25 | call to getenv | test.cpp:15:22:15:25 | nptr | AST only |
24+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:8:24:8:25 | s1 | AST only |
1125
| test.cpp:83:28:83:33 | call to getenv | test.cpp:11:20:11:21 | s1 | AST only |
26+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:11:36:11:37 | s2 | AST only |
27+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:83:17:83:24 | userName | AST only |
1228
| test.cpp:83:28:83:33 | call to getenv | test.cpp:85:8:85:11 | copy | AST only |
29+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:86:2:86:7 | call to strcpy | AST only |
1330
| test.cpp:83:28:83:33 | call to getenv | test.cpp:86:9:86:12 | copy | AST only |
31+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:14:88:17 | (const char *)... | AST only |
32+
| test.cpp:100:12:100:15 | call to gets | test.cpp:98:8:98:14 | pointer | AST only |
1433
| test.cpp:100:12:100:15 | call to gets | test.cpp:100:2:100:8 | pointer | AST only |
34+
| test.cpp:100:17:100:22 | buffer | test.cpp:93:18:93:18 | s | AST only |
1535
| test.cpp:100:17:100:22 | buffer | test.cpp:97:7:97:12 | buffer | AST only |
1636
| test.cpp:100:17:100:22 | buffer | test.cpp:100:17:100:22 | array to pointer conversion | IR only |
37+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:8:24:8:25 | s1 | AST only |
1738
| test.cpp:106:28:106:33 | call to getenv | test.cpp:11:20:11:21 | s1 | AST only |
39+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:11:36:11:37 | s2 | AST only |
40+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:106:17:106:24 | userName | AST only |
1841
| test.cpp:106:28:106:33 | call to getenv | test.cpp:108:8:108:11 | copy | AST only |
42+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:109:2:109:7 | call to strcpy | AST only |
1943
| test.cpp:106:28:106:33 | call to getenv | test.cpp:109:9:109:12 | copy | AST only |
44+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:14:111:17 | (const char *)... | AST only |

‎cpp/ql/test/library-tests/dataflow/security-taint/tainted_ir.expected‎

Lines changed: 46 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,46 @@
1-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:8:24:8:25 | s1 | |
2-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:23:14:23:19 | envStr | |
3-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:23:23:23:28 | call to getenv | |
4-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:23:23:23:40 | (const char *)... | |
5-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:6:25:29 | ! ... | |
6-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:7:25:12 | call to strcmp | |
7-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:7:25:29 | (bool)... | |
8-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:14:25:19 | envStr | |
9-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:6:29:28 | ! ... | |
10-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:7:29:12 | call to strcmp | |
11-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:7:29:28 | (bool)... | |
12-
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:14:29:19 | envStr | |
13-
| test.cpp:38:23:38:28 | call to getenv | test.cpp:8:24:8:25 | s1 | |
14-
| test.cpp:38:23:38:28 | call to getenv | test.cpp:38:14:38:19 | envStr | |
15-
| test.cpp:38:23:38:28 | call to getenv | test.cpp:38:23:38:28 | call to getenv | |
16-
| test.cpp:38:23:38:28 | call to getenv | test.cpp:38:23:38:40 | (const char *)... | |
17-
| test.cpp:38:23:38:28 | call to getenv | test.cpp:40:14:40:19 | envStr | |
18-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:8:24:8:25 | s1 | |
19-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:45:13:45:24 | envStrGlobal | |
20-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:49:14:49:19 | envStr | |
21-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:49:23:49:28 | call to getenv | |
22-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:49:23:49:40 | (const char *)... | |
23-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:52:16:52:21 | envStr | |
24-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:6:54:35 | ! ... | |
25-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:7:54:12 | call to strcmp | |
26-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:7:54:35 | (bool)... | |
27-
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:14:54:25 | envStrGlobal | |
28-
| test.cpp:60:29:60:34 | call to getenv | test.cpp:10:27:10:27 | s | |
29-
| test.cpp:60:29:60:34 | call to getenv | test.cpp:60:18:60:25 | userName | |
30-
| test.cpp:60:29:60:34 | call to getenv | test.cpp:60:29:60:34 | call to getenv | |
31-
| test.cpp:60:29:60:34 | call to getenv | test.cpp:60:29:60:47 | (const char *)... | |
32-
| test.cpp:60:29:60:34 | call to getenv | test.cpp:64:25:64:32 | userName | |
33-
| test.cpp:68:28:68:33 | call to getenv | test.cpp:11:36:11:37 | s2 | |
34-
| test.cpp:68:28:68:33 | call to getenv | test.cpp:68:17:68:24 | userName | |
35-
| test.cpp:68:28:68:33 | call to getenv | test.cpp:68:28:68:33 | call to getenv | |
36-
| test.cpp:68:28:68:33 | call to getenv | test.cpp:68:28:68:46 | (const char *)... | |
37-
| test.cpp:68:28:68:33 | call to getenv | test.cpp:70:5:70:10 | call to strcpy | |
38-
| test.cpp:68:28:68:33 | call to getenv | test.cpp:70:18:70:25 | userName | |
39-
| test.cpp:75:20:75:25 | call to getenv | test.cpp:15:22:15:25 | nptr | |
40-
| test.cpp:75:20:75:25 | call to getenv | test.cpp:75:15:75:18 | call to atoi | |
41-
| test.cpp:75:20:75:25 | call to getenv | test.cpp:75:20:75:25 | call to getenv | |
42-
| test.cpp:75:20:75:25 | call to getenv | test.cpp:75:20:75:45 | (const char *)... | |
43-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:8:24:8:25 | s1 | |
44-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:11:36:11:37 | s2 | |
45-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:83:17:83:24 | userName | |
46-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:83:28:83:33 | call to getenv | |
47-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:83:28:83:46 | (const char *)... | |
48-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:86:2:86:7 | call to strcpy | |
49-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:86:15:86:22 | userName | |
50-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:6:88:27 | ! ... | |
51-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:7:88:12 | call to strcmp | |
52-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:7:88:27 | (bool)... | |
53-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:14:88:17 | (const char *)... | |
54-
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:14:88:17 | copy | |
55-
| test.cpp:100:12:100:15 | call to gets | test.cpp:98:8:98:14 | pointer | |
56-
| test.cpp:100:12:100:15 | call to gets | test.cpp:100:12:100:15 | call to gets | |
57-
| test.cpp:100:17:100:22 | buffer | test.cpp:93:18:93:18 | s | |
58-
| test.cpp:100:17:100:22 | buffer | test.cpp:100:17:100:22 | array to pointer conversion | |
59-
| test.cpp:100:17:100:22 | buffer | test.cpp:100:17:100:22 | buffer | |
60-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:8:24:8:25 | s1 | |
61-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:11:36:11:37 | s2 | |
62-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:106:17:106:24 | userName | |
63-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:106:28:106:33 | call to getenv | |
64-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:106:28:106:46 | (const char *)... | |
65-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:109:2:109:7 | call to strcpy | |
66-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:109:15:109:22 | userName | |
67-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:6:111:27 | ! ... | |
68-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:7:111:12 | call to strcmp | |
69-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:7:111:27 | (bool)... | |
70-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:14:111:17 | (const char *)... | |
71-
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:14:111:17 | copy | |
1+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:23:23:23:28 | call to getenv |
2+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:23:23:23:40 | (const char *)... |
3+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:6:25:29 | ! ... |
4+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:7:25:12 | call to strcmp |
5+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:7:25:29 | (bool)... |
6+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:25:14:25:19 | envStr |
7+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:6:29:28 | ! ... |
8+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:7:29:12 | call to strcmp |
9+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:7:29:28 | (bool)... |
10+
| test.cpp:23:23:23:28 | call to getenv | test.cpp:29:14:29:19 | envStr |
11+
| test.cpp:38:23:38:28 | call to getenv | test.cpp:38:23:38:28 | call to getenv |
12+
| test.cpp:38:23:38:28 | call to getenv | test.cpp:38:23:38:40 | (const char *)... |
13+
| test.cpp:38:23:38:28 | call to getenv | test.cpp:40:14:40:19 | envStr |
14+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:49:23:49:28 | call to getenv |
15+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:49:23:49:40 | (const char *)... |
16+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:52:16:52:21 | envStr |
17+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:6:54:35 | ! ... |
18+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:7:54:12 | call to strcmp |
19+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:7:54:35 | (bool)... |
20+
| test.cpp:49:23:49:28 | call to getenv | test.cpp:54:14:54:25 | envStrGlobal |
21+
| test.cpp:60:29:60:34 | call to getenv | test.cpp:60:29:60:34 | call to getenv |
22+
| test.cpp:60:29:60:34 | call to getenv | test.cpp:60:29:60:47 | (const char *)... |
23+
| test.cpp:60:29:60:34 | call to getenv | test.cpp:64:25:64:32 | userName |
24+
| test.cpp:68:28:68:33 | call to getenv | test.cpp:68:28:68:33 | call to getenv |
25+
| test.cpp:68:28:68:33 | call to getenv | test.cpp:68:28:68:46 | (const char *)... |
26+
| test.cpp:68:28:68:33 | call to getenv | test.cpp:70:18:70:25 | userName |
27+
| test.cpp:75:20:75:25 | call to getenv | test.cpp:75:15:75:18 | call to atoi |
28+
| test.cpp:75:20:75:25 | call to getenv | test.cpp:75:20:75:25 | call to getenv |
29+
| test.cpp:75:20:75:25 | call to getenv | test.cpp:75:20:75:45 | (const char *)... |
30+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:83:28:83:33 | call to getenv |
31+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:83:28:83:46 | (const char *)... |
32+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:86:15:86:22 | userName |
33+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:6:88:27 | ! ... |
34+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:7:88:12 | call to strcmp |
35+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:7:88:27 | (bool)... |
36+
| test.cpp:83:28:83:33 | call to getenv | test.cpp:88:14:88:17 | copy |
37+
| test.cpp:100:12:100:15 | call to gets | test.cpp:100:12:100:15 | call to gets |
38+
| test.cpp:100:17:100:22 | buffer | test.cpp:100:17:100:22 | array to pointer conversion |
39+
| test.cpp:100:17:100:22 | buffer | test.cpp:100:17:100:22 | buffer |
40+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:106:28:106:33 | call to getenv |
41+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:106:28:106:46 | (const char *)... |
42+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:109:15:109:22 | userName |
43+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:6:111:27 | ! ... |
44+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:7:111:12 | call to strcmp |
45+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:7:111:27 | (bool)... |
46+
| test.cpp:106:28:106:33 | call to getenv | test.cpp:111:14:111:17 | copy |

‎cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
| taint.cpp:42:7:42:13 | taint.cpp:35:12:35:17 | AST only |
201201
| taint.cpp:43:7:43:13 | taint.cpp:37:22:37:27 | AST only |
202202
| taint.cpp:137:7:137:9 | taint.cpp:120:11:120:16 | AST only |
203-
| taint.cpp:195:7:195:7 | taint.cpp:192:23:192:28 | AST only |
204203
| taint.cpp:195:7:195:7 | taint.cpp:193:6:193:6 | AST only |
205204
| taint.cpp:236:3:236:6 | taint.cpp:223:10:223:15 | AST only |
206205
| taint.cpp:372:7:372:7 | taint.cpp:365:24:365:29 | AST only |

‎cpp/ql/test/library-tests/dataflow/taint-tests/test_ir.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@
513513
| taint.cpp:168:8:168:14 | tainted | taint.cpp:164:19:164:24 | call to source |
514514
| taint.cpp:173:8:173:13 | Argument 0 indirection | taint.cpp:164:19:164:24 | call to source |
515515
| taint.cpp:181:8:181:9 | * ... | taint.cpp:185:11:185:16 | call to source |
516+
| taint.cpp:195:7:195:7 | x | taint.cpp:192:23:192:28 | source |
516517
| taint.cpp:210:7:210:7 | x | taint.cpp:207:6:207:11 | call to source |
517518
| taint.cpp:215:7:215:7 | x | taint.cpp:207:6:207:11 | call to source |
518519
| taint.cpp:216:7:216:7 | y | taint.cpp:207:6:207:11 | call to source |

0 commit comments

Comments
 (0)