Skip to content

Commit 4b2aa93

Browse files
committed
Update test expectations after rebase
1 parent 8525db5 commit 4b2aa93

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

swift/ql/test/library-tests/dataflow/taint/LocalTaint.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,4 @@
125125
| string.swift:39:29:39:29 | < | string.swift:39:13:39:29 | ... .+(_:_:) ... |
126126
| subscript.swift:13:10:13:17 | call to source() | subscript.swift:13:10:13:20 | ...[...] |
127127
| subscript.swift:14:10:14:18 | call to source2() | subscript.swift:14:10:14:21 | ...[...] |
128+
| url.swift:69:15:69:26 | .pathComponents | url.swift:69:15:69:42 | ...[...] |

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ edges
1414
| file://:0:0:0:0 | [summary] to write: return (return).password in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [password] : |
1515
| file://:0:0:0:0 | [summary] to write: return (return).path in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [path] : |
1616
| file://:0:0:0:0 | [summary] to write: return (return).path in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [path] : |
17+
| file://:0:0:0:0 | [summary] to write: return (return).pathComponents in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathComponents] : |
18+
| file://:0:0:0:0 | [summary] to write: return (return).pathComponents in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathComponents] : |
1719
| file://:0:0:0:0 | [summary] to write: return (return).pathExtension in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathExtension] : |
1820
| file://:0:0:0:0 | [summary] to write: return (return).pathExtension in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathExtension] : |
1921
| file://:0:0:0:0 | [summary] to write: return (return).port in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [port] : |
@@ -55,6 +57,7 @@ edges
5557
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).lastPathComponent in init(string:) : |
5658
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).password in init(string:) : |
5759
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).path in init(string:) : |
60+
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).pathComponents in init(string:) : |
5861
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).pathExtension in init(string:) : |
5962
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).port in init(string:) : |
6063
| url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return).query in init(string:) : |
@@ -72,6 +75,7 @@ edges
7275
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).lastPathComponent in init(string:) : |
7376
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).password in init(string:) : |
7477
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).path in init(string:) : |
78+
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).pathComponents in init(string:) : |
7579
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).pathExtension in init(string:) : |
7680
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).port in init(string:) : |
7781
| url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return).query in init(string:) : |
@@ -99,6 +103,7 @@ edges
99103
| url.swift:59:19:59:38 | call to init(string:) [host] : | url.swift:66:15:66:15 | urlTainted [host] : |
100104
| url.swift:59:19:59:38 | call to init(string:) [lastPathComponent] : | url.swift:67:15:67:15 | urlTainted [lastPathComponent] : |
101105
| url.swift:59:19:59:38 | call to init(string:) [password] : | url.swift:79:15:79:15 | urlTainted [password] : |
106+
| url.swift:59:19:59:38 | call to init(string:) [pathComponents] : | url.swift:69:15:69:15 | urlTainted [pathComponents] : |
102107
| url.swift:59:19:59:38 | call to init(string:) [pathExtension] : | url.swift:70:15:70:15 | urlTainted [pathExtension] : |
103108
| url.swift:59:19:59:38 | call to init(string:) [path] : | url.swift:68:15:68:15 | urlTainted [path] : |
104109
| url.swift:59:19:59:38 | call to init(string:) [port] : | url.swift:71:12:71:12 | urlTainted [port] : |
@@ -118,6 +123,7 @@ edges
118123
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [host] : |
119124
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [lastPathComponent] : |
120125
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [password] : |
126+
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [pathComponents] : |
121127
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [pathExtension] : |
122128
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [path] : |
123129
| url.swift:59:31:59:31 | tainted : | url.swift:59:19:59:38 | call to init(string:) [port] : |
@@ -136,6 +142,8 @@ edges
136142
| url.swift:66:15:66:26 | .host : | url.swift:66:15:66:30 | ...! |
137143
| url.swift:67:15:67:15 | urlTainted [lastPathComponent] : | url.swift:67:15:67:26 | .lastPathComponent |
138144
| url.swift:68:15:68:15 | urlTainted [path] : | url.swift:68:15:68:26 | .path |
145+
| url.swift:69:15:69:15 | urlTainted [pathComponents] : | url.swift:69:15:69:26 | .pathComponents : |
146+
| url.swift:69:15:69:26 | .pathComponents : | url.swift:69:15:69:42 | ...[...] |
139147
| url.swift:70:15:70:15 | urlTainted [pathExtension] : | url.swift:70:15:70:26 | .pathExtension |
140148
| url.swift:71:12:71:12 | urlTainted [port] : | url.swift:71:12:71:23 | .port : |
141149
| url.swift:71:12:71:23 | .port : | url.swift:71:12:71:27 | ...! |
@@ -182,6 +190,8 @@ nodes
182190
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [lastPathComponent] : | semmle.label | [summary] to write: return (return) in init(string:) [lastPathComponent] : |
183191
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [password] : | semmle.label | [summary] to write: return (return) in init(string:) [password] : |
184192
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [password] : | semmle.label | [summary] to write: return (return) in init(string:) [password] : |
193+
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathComponents] : | semmle.label | [summary] to write: return (return) in init(string:) [pathComponents] : |
194+
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathComponents] : | semmle.label | [summary] to write: return (return) in init(string:) [pathComponents] : |
185195
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathExtension] : | semmle.label | [summary] to write: return (return) in init(string:) [pathExtension] : |
186196
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathExtension] : | semmle.label | [summary] to write: return (return) in init(string:) [pathExtension] : |
187197
| file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [path] : | semmle.label | [summary] to write: return (return) in init(string:) [path] : |
@@ -220,6 +230,8 @@ nodes
220230
| file://:0:0:0:0 | [summary] to write: return (return).password in init(string:) : | semmle.label | [summary] to write: return (return).password in init(string:) : |
221231
| file://:0:0:0:0 | [summary] to write: return (return).path in init(string:) : | semmle.label | [summary] to write: return (return).path in init(string:) : |
222232
| file://:0:0:0:0 | [summary] to write: return (return).path in init(string:) : | semmle.label | [summary] to write: return (return).path in init(string:) : |
233+
| file://:0:0:0:0 | [summary] to write: return (return).pathComponents in init(string:) : | semmle.label | [summary] to write: return (return).pathComponents in init(string:) : |
234+
| file://:0:0:0:0 | [summary] to write: return (return).pathComponents in init(string:) : | semmle.label | [summary] to write: return (return).pathComponents in init(string:) : |
223235
| file://:0:0:0:0 | [summary] to write: return (return).pathExtension in init(string:) : | semmle.label | [summary] to write: return (return).pathExtension in init(string:) : |
224236
| file://:0:0:0:0 | [summary] to write: return (return).pathExtension in init(string:) : | semmle.label | [summary] to write: return (return).pathExtension in init(string:) : |
225237
| file://:0:0:0:0 | [summary] to write: return (return).port in init(string:) : | semmle.label | [summary] to write: return (return).port in init(string:) : |
@@ -276,6 +288,7 @@ nodes
276288
| url.swift:59:19:59:38 | call to init(string:) [host] : | semmle.label | call to init(string:) [host] : |
277289
| url.swift:59:19:59:38 | call to init(string:) [lastPathComponent] : | semmle.label | call to init(string:) [lastPathComponent] : |
278290
| url.swift:59:19:59:38 | call to init(string:) [password] : | semmle.label | call to init(string:) [password] : |
291+
| url.swift:59:19:59:38 | call to init(string:) [pathComponents] : | semmle.label | call to init(string:) [pathComponents] : |
279292
| url.swift:59:19:59:38 | call to init(string:) [pathExtension] : | semmle.label | call to init(string:) [pathExtension] : |
280293
| url.swift:59:19:59:38 | call to init(string:) [path] : | semmle.label | call to init(string:) [path] : |
281294
| url.swift:59:19:59:38 | call to init(string:) [port] : | semmle.label | call to init(string:) [port] : |
@@ -302,6 +315,9 @@ nodes
302315
| url.swift:67:15:67:26 | .lastPathComponent | semmle.label | .lastPathComponent |
303316
| url.swift:68:15:68:15 | urlTainted [path] : | semmle.label | urlTainted [path] : |
304317
| url.swift:68:15:68:26 | .path | semmle.label | .path |
318+
| url.swift:69:15:69:15 | urlTainted [pathComponents] : | semmle.label | urlTainted [pathComponents] : |
319+
| url.swift:69:15:69:26 | .pathComponents : | semmle.label | .pathComponents : |
320+
| url.swift:69:15:69:42 | ...[...] | semmle.label | ...[...] |
305321
| url.swift:70:15:70:15 | urlTainted [pathExtension] : | semmle.label | urlTainted [pathExtension] : |
306322
| url.swift:70:15:70:26 | .pathExtension | semmle.label | .pathExtension |
307323
| url.swift:71:12:71:12 | urlTainted [port] : | semmle.label | urlTainted [port] : |
@@ -347,6 +363,7 @@ subpaths
347363
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [host] : | url.swift:59:19:59:38 | call to init(string:) [host] : |
348364
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [lastPathComponent] : | url.swift:59:19:59:38 | call to init(string:) [lastPathComponent] : |
349365
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [password] : | url.swift:59:19:59:38 | call to init(string:) [password] : |
366+
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathComponents] : | url.swift:59:19:59:38 | call to init(string:) [pathComponents] : |
350367
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathExtension] : | url.swift:59:19:59:38 | call to init(string:) [pathExtension] : |
351368
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [path] : | url.swift:59:19:59:38 | call to init(string:) [path] : |
352369
| url.swift:59:31:59:31 | tainted : | url.swift:8:2:8:25 | [summary param] 0 in init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [port] : | url.swift:59:19:59:38 | call to init(string:) [port] : |
@@ -364,6 +381,7 @@ subpaths
364381
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [host] : | url.swift:59:19:59:38 | call to init(string:) [host] : |
365382
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [lastPathComponent] : | url.swift:59:19:59:38 | call to init(string:) [lastPathComponent] : |
366383
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [password] : | url.swift:59:19:59:38 | call to init(string:) [password] : |
384+
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathComponents] : | url.swift:59:19:59:38 | call to init(string:) [pathComponents] : |
367385
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [pathExtension] : | url.swift:59:19:59:38 | call to init(string:) [pathExtension] : |
368386
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [path] : | url.swift:59:19:59:38 | call to init(string:) [path] : |
369387
| url.swift:59:31:59:31 | tainted : | url.swift:8:8:8:16 | string : | file://:0:0:0:0 | [summary] to write: return (return) in init(string:) [port] : | url.swift:59:19:59:38 | call to init(string:) [port] : |
@@ -403,6 +421,7 @@ subpaths
403421
| url.swift:66:15:66:30 | ...! | url.swift:57:16:57:23 | call to source() : | url.swift:66:15:66:30 | ...! | result |
404422
| url.swift:67:15:67:26 | .lastPathComponent | url.swift:57:16:57:23 | call to source() : | url.swift:67:15:67:26 | .lastPathComponent | result |
405423
| url.swift:68:15:68:26 | .path | url.swift:57:16:57:23 | call to source() : | url.swift:68:15:68:26 | .path | result |
424+
| url.swift:69:15:69:42 | ...[...] | url.swift:57:16:57:23 | call to source() : | url.swift:69:15:69:42 | ...[...] | result |
406425
| url.swift:70:15:70:26 | .pathExtension | url.swift:57:16:57:23 | call to source() : | url.swift:70:15:70:26 | .pathExtension | result |
407426
| url.swift:71:12:71:27 | ...! | url.swift:57:16:57:23 | call to source() : | url.swift:71:12:71:27 | ...! | result |
408427
| url.swift:72:15:72:31 | ...! | url.swift:57:16:57:23 | call to source() : | url.swift:72:15:72:31 | ...! | result |

0 commit comments

Comments
 (0)