Skip to content

Commit 2d05b85

Browse files
geoffw0geoffw0
committed
Swift: Fix uses of legacy CArrayElement.
1 parent 311daa2 commit 2d05b85

3 files changed

Lines changed: 18 additions & 19 deletions

File tree

‎swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Array.qll‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ private class ArraySummaries extends SummaryModelCsv {
1919
override predicate row(string row) {
2020
row =
2121
[
22-
";Array;true;init(_:);;;Argument[0];ReturnValue.ArrayElement;value",
23-
";Array;true;init(_:);;;Argument[0].ArrayElement;ReturnValue.ArrayElement;value",
24-
";Array;true;init(_:);;;Argument[0].CollectionElement;ReturnValue.ArrayElement;value",
25-
";Array;true;init(repeating:count:);;;Argument[0];ReturnValue.ArrayElement;value",
26-
";Array;true;init(arrayLiteral:);;;Argument[0].ArrayElement;ReturnValue.ArrayElement;value",
22+
";Array;true;init(_:);;;Argument[0];ReturnValue.CollectionElement;value",
23+
";Array;true;init(_:);;;Argument[0].CollectionElement;ReturnValue.CollectionElement;value",
24+
";Array;true;init(repeating:count:);;;Argument[0];ReturnValue.CollectionElement;value",
25+
";Array;true;init(arrayLiteral:);;;Argument[0].CollectionElement;ReturnValue.CollectionElement;value",
2726
";Array;true;insert(_:at:);;;Argument[0];Argument[-1].CollectionElement;value",
2827
";Array;true;insert(_:at:);;;Argument[1];Argument[-1];taint",
2928
";Array;true;withUnsafeBufferPointer(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",

‎swift/ql/lib/codeql/swift/frameworks/StandardLibrary/CInterop.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ private import codeql.swift.dataflow.ExternalFlow
77

88
private class CInteropSummaries extends SummaryModelCsv {
99
override predicate row(string row) {
10-
row = ";;false;getVaList(_:);;;Argument[0].ArrayElement;ReturnValue;value"
10+
row = ";;false;getVaList(_:);;;Argument[0].CollectionElement;ReturnValue;value"
1111
}
1212
}

‎swift/ql/test/library-tests/dataflow/taint/core/Taint.expected‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ edges
55
| conversions.swift:30:19:30:29 | call to sourceInt() | conversions.swift:30:12:30:30 | call to String.init(_:) |
66
| conversions.swift:31:12:31:30 | call to String.init(_:) | conversions.swift:31:12:31:32 | .utf8 |
77
| conversions.swift:31:19:31:29 | call to sourceInt() | conversions.swift:31:12:31:30 | call to String.init(_:) |
8-
| conversions.swift:33:12:33:30 | [...] [Array element] | conversions.swift:35:12:35:12 | arr [Array element] |
9-
| conversions.swift:33:12:33:30 | [...] [Array element] | conversions.swift:37:20:37:20 | arr [Array element] |
10-
| conversions.swift:33:19:33:29 | call to sourceInt() | conversions.swift:33:12:33:30 | [...] [Array element] |
11-
| conversions.swift:35:12:35:12 | arr [Array element] | conversions.swift:35:12:35:17 | ...[...] |
12-
| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Array element] | conversions.swift:37:12:37:26 | ...[...] |
13-
| conversions.swift:37:20:37:20 | arr [Array element] | conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Array element] |
14-
| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Array element] | conversions.swift:39:12:39:42 | ...[...] |
8+
| conversions.swift:33:12:33:30 | [...] [Collection element] | conversions.swift:35:12:35:12 | arr [Collection element] |
9+
| conversions.swift:33:12:33:30 | [...] [Collection element] | conversions.swift:37:20:37:20 | arr [Collection element] |
10+
| conversions.swift:33:19:33:29 | call to sourceInt() | conversions.swift:33:12:33:30 | [...] [Collection element] |
11+
| conversions.swift:35:12:35:12 | arr [Collection element] | conversions.swift:35:12:35:17 | ...[...] |
12+
| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:37:12:37:26 | ...[...] |
13+
| conversions.swift:37:20:37:20 | arr [Collection element] | conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Collection element] |
14+
| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:39:12:39:42 | ...[...] |
1515
| conversions.swift:39:20:39:33 | call to sourceString() | conversions.swift:39:20:39:35 | .utf8 |
16-
| conversions.swift:39:20:39:35 | .utf8 | conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Array element] |
16+
| conversions.swift:39:20:39:35 | .utf8 | conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Collection element] |
1717
| conversions.swift:41:13:41:23 | call to sourceInt() | conversions.swift:42:13:42:13 | v |
1818
| conversions.swift:45:18:45:41 | call to numericCast(_:) | conversions.swift:46:12:46:12 | v2 |
1919
| conversions.swift:45:30:45:40 | call to sourceInt() | conversions.swift:45:18:45:41 | call to numericCast(_:) |
@@ -147,14 +147,14 @@ nodes
147147
| conversions.swift:31:12:31:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
148148
| conversions.swift:31:12:31:32 | .utf8 | semmle.label | .utf8 |
149149
| conversions.swift:31:19:31:29 | call to sourceInt() | semmle.label | call to sourceInt() |
150-
| conversions.swift:33:12:33:30 | [...] [Array element] | semmle.label | [...] [Array element] |
150+
| conversions.swift:33:12:33:30 | [...] [Collection element] | semmle.label | [...] [Collection element] |
151151
| conversions.swift:33:19:33:29 | call to sourceInt() | semmle.label | call to sourceInt() |
152-
| conversions.swift:35:12:35:12 | arr [Array element] | semmle.label | arr [Array element] |
152+
| conversions.swift:35:12:35:12 | arr [Collection element] | semmle.label | arr [Collection element] |
153153
| conversions.swift:35:12:35:17 | ...[...] | semmle.label | ...[...] |
154-
| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Array element] | semmle.label | call to Array<Element>.init(_:) [Array element] |
154+
| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
155155
| conversions.swift:37:12:37:26 | ...[...] | semmle.label | ...[...] |
156-
| conversions.swift:37:20:37:20 | arr [Array element] | semmle.label | arr [Array element] |
157-
| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Array element] | semmle.label | call to Array<Element>.init(_:) [Array element] |
156+
| conversions.swift:37:20:37:20 | arr [Collection element] | semmle.label | arr [Collection element] |
157+
| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
158158
| conversions.swift:39:12:39:42 | ...[...] | semmle.label | ...[...] |
159159
| conversions.swift:39:20:39:33 | call to sourceString() | semmle.label | call to sourceString() |
160160
| conversions.swift:39:20:39:35 | .utf8 | semmle.label | .utf8 |

0 commit comments

Comments
 (0)