Skip to content

Commit 117a80e

Browse files
committed
Rust: Accept consistency check changes.
1 parent 01c6966 commit 117a80e

File tree

2 files changed

+32
-17
lines changed

2 files changed

+32
-17
lines changed

rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
1+
multipleMethodCallTargets
2+
| main.rs:187:13:187:43 | ...::System.allocate(...) | file://:0:0:0:0 | fn allocate |
3+
| main.rs:187:13:187:43 | ...::System.allocate(...) | file://:0:0:0:0 | fn allocate |
4+
| main.rs:188:13:188:50 | ...::System.allocate_zeroed(...) | file://:0:0:0:0 | fn allocate_zeroed |
5+
| main.rs:188:13:188:50 | ...::System.allocate_zeroed(...) | file://:0:0:0:0 | fn allocate_zeroed |
6+
| main.rs:195:13:195:43 | ...::System.allocate(...) | file://:0:0:0:0 | fn allocate |
7+
| main.rs:195:13:195:43 | ...::System.allocate(...) | file://:0:0:0:0 | fn allocate |
8+
| main.rs:196:13:196:50 | ...::System.allocate_zeroed(...) | file://:0:0:0:0 | fn allocate_zeroed |
9+
| main.rs:196:13:196:50 | ...::System.allocate_zeroed(...) | file://:0:0:0:0 | fn allocate_zeroed |
10+
| main.rs:208:21:208:55 | ...::System.grow(...) | file://:0:0:0:0 | fn grow |
11+
| main.rs:208:21:208:55 | ...::System.grow(...) | file://:0:0:0:0 | fn grow |
12+
| main.rs:210:21:210:62 | ...::System.grow_zeroed(...) | file://:0:0:0:0 | fn grow_zeroed |
13+
| main.rs:210:21:210:62 | ...::System.grow_zeroed(...) | file://:0:0:0:0 | fn grow_zeroed |
14+
| main.rs:213:17:213:53 | ...::System.shrink(...) | file://:0:0:0:0 | fn shrink |
15+
| main.rs:213:17:213:53 | ...::System.shrink(...) | file://:0:0:0:0 | fn shrink |
116
multiplePathResolutions
2-
| main.rs:218:14:218:17 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
3-
| main.rs:218:14:218:17 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
17+
| main.rs:218:14:218:17 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
18+
| main.rs:218:14:218:17 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
419
| main.rs:218:14:218:25 | ...::malloc | file://:0:0:0:0 | fn malloc |
520
| main.rs:218:14:218:25 | ...::malloc | file://:0:0:0:0 | fn malloc |
6-
| main.rs:219:13:219:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
7-
| main.rs:219:13:219:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
21+
| main.rs:219:13:219:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
22+
| main.rs:219:13:219:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
823
| main.rs:219:13:219:24 | ...::malloc | file://:0:0:0:0 | fn malloc |
924
| main.rs:219:13:219:24 | ...::malloc | file://:0:0:0:0 | fn malloc |
10-
| main.rs:220:13:220:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
11-
| main.rs:220:13:220:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
25+
| main.rs:220:13:220:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
26+
| main.rs:220:13:220:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
1227
| main.rs:220:13:220:31 | ...::aligned_alloc | file://:0:0:0:0 | fn aligned_alloc |
1328
| main.rs:220:13:220:31 | ...::aligned_alloc | file://:0:0:0:0 | fn aligned_alloc |
14-
| main.rs:221:13:221:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
15-
| main.rs:221:13:221:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
29+
| main.rs:221:13:221:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
30+
| main.rs:221:13:221:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
1631
| main.rs:221:13:221:31 | ...::aligned_alloc | file://:0:0:0:0 | fn aligned_alloc |
1732
| main.rs:221:13:221:31 | ...::aligned_alloc | file://:0:0:0:0 | fn aligned_alloc |
18-
| main.rs:222:13:222:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
19-
| main.rs:222:13:222:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
33+
| main.rs:222:13:222:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
34+
| main.rs:222:13:222:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
2035
| main.rs:222:13:222:24 | ...::calloc | file://:0:0:0:0 | fn calloc |
2136
| main.rs:222:13:222:24 | ...::calloc | file://:0:0:0:0 | fn calloc |
22-
| main.rs:223:13:223:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
23-
| main.rs:223:13:223:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
37+
| main.rs:223:13:223:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
38+
| main.rs:223:13:223:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
2439
| main.rs:223:13:223:24 | ...::calloc | file://:0:0:0:0 | fn calloc |
2540
| main.rs:223:13:223:24 | ...::calloc | file://:0:0:0:0 | fn calloc |
26-
| main.rs:224:13:224:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
27-
| main.rs:224:13:224:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
41+
| main.rs:224:13:224:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
42+
| main.rs:224:13:224:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
2843
| main.rs:224:13:224:25 | ...::realloc | file://:0:0:0:0 | fn realloc |
2944
| main.rs:224:13:224:25 | ...::realloc | file://:0:0:0:0 | fn realloc |
3045
| main.rs:229:13:229:37 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
multiplePathResolutions
22
| deallocation.rs:106:16:106:19 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
3-
| deallocation.rs:106:16:106:19 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
3+
| deallocation.rs:106:16:106:19 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
44
| deallocation.rs:106:16:106:27 | ...::malloc | file://:0:0:0:0 | fn malloc |
55
| deallocation.rs:106:16:106:27 | ...::malloc | file://:0:0:0:0 | fn malloc |
66
| deallocation.rs:112:3:112:6 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
7-
| deallocation.rs:112:3:112:6 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
7+
| deallocation.rs:112:3:112:6 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
88
| deallocation.rs:112:3:112:12 | ...::free | file://:0:0:0:0 | fn free |
99
| deallocation.rs:112:3:112:12 | ...::free | file://:0:0:0:0 | fn free |
1010
| deallocation.rs:112:29:112:32 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
11-
| deallocation.rs:112:29:112:32 | libc | file://:0:0:0:0 | Crate(libc@0.2.173) |
11+
| deallocation.rs:112:29:112:32 | libc | file://:0:0:0:0 | Crate(libc@0.2.174) |
1212
| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
1313
| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
1414
| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |

0 commit comments

Comments
 (0)