Skip to content

Commit a6fe620

Browse files
geoffw0geoffw0
committed
Swift: Fix Swift warnings in the test.
1 parent 3a38f3b commit a6fe620

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

‎swift/ql/test/query-tests/Security/CWE-134/UncontrolledFormatString.expected

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ edges
33
| UncontrolledFormatString.swift:78:22:80:5 | format | UncontrolledFormatString.swift:78:22:80:5 | { ... } [format] |
44
| UncontrolledFormatString.swift:78:22:80:5 | { ... } [format] | UncontrolledFormatString.swift:79:16:79:16 | this [format] |
55
| UncontrolledFormatString.swift:79:16:79:16 | this [format] | UncontrolledFormatString.swift:79:16:79:16 | format |
6-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:97:28:97:28 | tainted |
7-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:100:28:100:28 | tainted |
8-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:101:28:101:28 | tainted |
9-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:103:28:103:28 | tainted |
10-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:104:28:104:28 | tainted |
11-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:105:28:105:28 | tainted |
12-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:106:46:106:46 | tainted |
13-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:108:47:108:47 | tainted |
14-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:109:65:109:65 | tainted |
15-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:111:54:111:54 | tainted |
16-
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:112:72:112:72 | tainted |
6+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:97:24:97:24 | tainted |
7+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:100:24:100:24 | tainted |
8+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:101:24:101:24 | tainted |
9+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:103:24:103:24 | tainted |
10+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:104:24:104:24 | tainted |
11+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:105:24:105:24 | tainted |
12+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:106:42:106:42 | tainted |
13+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:108:43:108:43 | tainted |
14+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:109:57:109:57 | tainted |
15+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:111:50:111:50 | tainted |
16+
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:112:64:112:64 | tainted |
1717
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:115:11:115:11 | tainted |
1818
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:116:11:116:11 | tainted |
1919
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:118:61:118:61 | tainted |
20-
| UncontrolledFormatString.swift:108:47:108:47 | tainted | UncontrolledFormatString.swift:108:30:108:54 | call to NSString.init(string:) |
21-
| UncontrolledFormatString.swift:109:65:109:65 | tainted | UncontrolledFormatString.swift:109:48:109:72 | call to NSString.init(string:) |
22-
| UncontrolledFormatString.swift:111:54:111:54 | tainted | UncontrolledFormatString.swift:111:37:111:61 | call to NSString.init(string:) |
23-
| UncontrolledFormatString.swift:112:72:112:72 | tainted | UncontrolledFormatString.swift:112:55:112:79 | call to NSString.init(string:) |
20+
| UncontrolledFormatString.swift:108:43:108:43 | tainted | UncontrolledFormatString.swift:108:26:108:50 | call to NSString.init(string:) |
21+
| UncontrolledFormatString.swift:109:57:109:57 | tainted | UncontrolledFormatString.swift:109:40:109:64 | call to NSString.init(string:) |
22+
| UncontrolledFormatString.swift:111:50:111:50 | tainted | UncontrolledFormatString.swift:111:33:111:57 | call to NSString.init(string:) |
23+
| UncontrolledFormatString.swift:112:64:112:64 | tainted | UncontrolledFormatString.swift:112:47:112:71 | call to NSString.init(string:) |
2424
| UncontrolledFormatString.swift:116:11:116:11 | tainted | UncontrolledFormatString.swift:77:12:77:22 | format |
2525
nodes
2626
| UncontrolledFormatString.swift:77:12:77:22 | format | semmle.label | format |
@@ -29,37 +29,37 @@ nodes
2929
| UncontrolledFormatString.swift:79:16:79:16 | format | semmle.label | format |
3030
| UncontrolledFormatString.swift:79:16:79:16 | this [format] | semmle.label | this [format] |
3131
| UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | semmle.label | call to String.init(contentsOf:) |
32-
| UncontrolledFormatString.swift:97:28:97:28 | tainted | semmle.label | tainted |
33-
| UncontrolledFormatString.swift:100:28:100:28 | tainted | semmle.label | tainted |
34-
| UncontrolledFormatString.swift:101:28:101:28 | tainted | semmle.label | tainted |
35-
| UncontrolledFormatString.swift:103:28:103:28 | tainted | semmle.label | tainted |
36-
| UncontrolledFormatString.swift:104:28:104:28 | tainted | semmle.label | tainted |
37-
| UncontrolledFormatString.swift:105:28:105:28 | tainted | semmle.label | tainted |
38-
| UncontrolledFormatString.swift:106:46:106:46 | tainted | semmle.label | tainted |
39-
| UncontrolledFormatString.swift:108:30:108:54 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
40-
| UncontrolledFormatString.swift:108:47:108:47 | tainted | semmle.label | tainted |
41-
| UncontrolledFormatString.swift:109:48:109:72 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
42-
| UncontrolledFormatString.swift:109:65:109:65 | tainted | semmle.label | tainted |
43-
| UncontrolledFormatString.swift:111:37:111:61 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
44-
| UncontrolledFormatString.swift:111:54:111:54 | tainted | semmle.label | tainted |
45-
| UncontrolledFormatString.swift:112:55:112:79 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
46-
| UncontrolledFormatString.swift:112:72:112:72 | tainted | semmle.label | tainted |
32+
| UncontrolledFormatString.swift:97:24:97:24 | tainted | semmle.label | tainted |
33+
| UncontrolledFormatString.swift:100:24:100:24 | tainted | semmle.label | tainted |
34+
| UncontrolledFormatString.swift:101:24:101:24 | tainted | semmle.label | tainted |
35+
| UncontrolledFormatString.swift:103:24:103:24 | tainted | semmle.label | tainted |
36+
| UncontrolledFormatString.swift:104:24:104:24 | tainted | semmle.label | tainted |
37+
| UncontrolledFormatString.swift:105:24:105:24 | tainted | semmle.label | tainted |
38+
| UncontrolledFormatString.swift:106:42:106:42 | tainted | semmle.label | tainted |
39+
| UncontrolledFormatString.swift:108:26:108:50 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
40+
| UncontrolledFormatString.swift:108:43:108:43 | tainted | semmle.label | tainted |
41+
| UncontrolledFormatString.swift:109:40:109:64 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
42+
| UncontrolledFormatString.swift:109:57:109:57 | tainted | semmle.label | tainted |
43+
| UncontrolledFormatString.swift:111:33:111:57 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
44+
| UncontrolledFormatString.swift:111:50:111:50 | tainted | semmle.label | tainted |
45+
| UncontrolledFormatString.swift:112:47:112:71 | call to NSString.init(string:) | semmle.label | call to NSString.init(string:) |
46+
| UncontrolledFormatString.swift:112:64:112:64 | tainted | semmle.label | tainted |
4747
| UncontrolledFormatString.swift:115:11:115:11 | tainted | semmle.label | tainted |
4848
| UncontrolledFormatString.swift:116:11:116:11 | tainted | semmle.label | tainted |
4949
| UncontrolledFormatString.swift:118:61:118:61 | tainted | semmle.label | tainted |
5050
subpaths
5151
#select
5252
| UncontrolledFormatString.swift:79:16:79:16 | format | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:79:16:79:16 | format | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
53-
| UncontrolledFormatString.swift:97:28:97:28 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:97:28:97:28 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
54-
| UncontrolledFormatString.swift:100:28:100:28 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:100:28:100:28 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
55-
| UncontrolledFormatString.swift:101:28:101:28 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:101:28:101:28 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
56-
| UncontrolledFormatString.swift:103:28:103:28 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:103:28:103:28 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
57-
| UncontrolledFormatString.swift:104:28:104:28 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:104:28:104:28 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
58-
| UncontrolledFormatString.swift:105:28:105:28 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:105:28:105:28 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
59-
| UncontrolledFormatString.swift:106:46:106:46 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:106:46:106:46 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
60-
| UncontrolledFormatString.swift:108:30:108:54 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:108:30:108:54 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
61-
| UncontrolledFormatString.swift:109:48:109:72 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:109:48:109:72 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
62-
| UncontrolledFormatString.swift:111:37:111:61 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:111:37:111:61 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
63-
| UncontrolledFormatString.swift:112:55:112:79 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:112:55:112:79 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
53+
| UncontrolledFormatString.swift:97:24:97:24 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:97:24:97:24 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
54+
| UncontrolledFormatString.swift:100:24:100:24 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:100:24:100:24 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
55+
| UncontrolledFormatString.swift:101:24:101:24 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:101:24:101:24 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
56+
| UncontrolledFormatString.swift:103:24:103:24 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:103:24:103:24 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
57+
| UncontrolledFormatString.swift:104:24:104:24 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:104:24:104:24 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
58+
| UncontrolledFormatString.swift:105:24:105:24 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:105:24:105:24 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
59+
| UncontrolledFormatString.swift:106:42:106:42 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:106:42:106:42 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
60+
| UncontrolledFormatString.swift:108:26:108:50 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:108:26:108:50 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
61+
| UncontrolledFormatString.swift:109:40:109:64 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:109:40:109:64 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
62+
| UncontrolledFormatString.swift:111:33:111:57 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:111:33:111:57 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
63+
| UncontrolledFormatString.swift:112:47:112:71 | call to NSString.init(string:) | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:112:47:112:71 | call to NSString.init(string:) | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
6464
| UncontrolledFormatString.swift:115:11:115:11 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:115:11:115:11 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |
6565
| UncontrolledFormatString.swift:118:61:118:61 | tainted | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | UncontrolledFormatString.swift:118:61:118:61 | tainted | This format string depends on $@. | UncontrolledFormatString.swift:91:24:91:77 | call to String.init(contentsOf:) | this user-provided value |

‎swift/ql/test/query-tests/Security/CWE-134/UncontrolledFormatString.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,26 +90,26 @@ class MyString {
9090
func tests() throws {
9191
let tainted = try! String(contentsOf: URL(string: "http://example.com")!)
9292

93-
let a = String("abc") // GOOD: not a format string
94-
let b = String(tainted) // GOOD: not a format string
93+
_ = String("abc") // GOOD: not a format string
94+
_ = String(tainted) // GOOD: not a format string
9595

96-
let c = String(format: "abc") // GOOD: not tainted
97-
let d = String(format: tainted) // BAD
98-
let e = String(format: "%s", "abc") // GOOD: not tainted
99-
let f = String(format: "%s", tainted) // GOOD: format string itself is not tainted
100-
let g = String(format: tainted, "abc") // BAD
101-
let h = String(format: tainted, tainted) // BAD
96+
_ = String(format: "abc") // GOOD: not tainted
97+
_ = String(format: tainted) // BAD
98+
_ = String(format: "%s", "abc") // GOOD: not tainted
99+
_ = String(format: "%s", tainted) // GOOD: format string itself is not tainted
100+
_ = String(format: tainted, "abc") // BAD
101+
_ = String(format: tainted, tainted) // BAD
102102

103-
let i = String(format: tainted, arguments: []) // BAD
104-
let j = String(format: tainted, locale: nil) // BAD
105-
let k = String(format: tainted, locale: nil, arguments: []) // BAD
106-
let l = String.localizedStringWithFormat(tainted) // BAD
103+
_ = String(format: tainted, arguments: []) // BAD
104+
_ = String(format: tainted, locale: nil) // BAD
105+
_ = String(format: tainted, locale: nil, arguments: []) // BAD
106+
_ = String.localizedStringWithFormat(tainted) // BAD
107107

108-
let m = NSString(format: NSString(string: tainted), "abc") // BAD
109-
let n = NSString.localizedStringWithFormat(NSString(string: tainted)) // BAD
108+
_ = NSString(format: NSString(string: tainted), "abc") // BAD
109+
NSString.localizedStringWithFormat(NSString(string: tainted)) // BAD
110110

111-
var o = NSMutableString(format: NSString(string: tainted), "abc") // BAD
112-
var p = NSMutableString.localizedStringWithFormat(NSString(string: tainted)) // BAD
111+
_ = NSMutableString(format: NSString(string: tainted), "abc") // BAD
112+
NSMutableString.localizedStringWithFormat(NSString(string: tainted)) // BAD
113113

114114
NSLog("abc") // GOOD: not tainted
115115
NSLog(tainted) // BAD
@@ -119,11 +119,11 @@ func tests() throws {
119119

120120
let taintedVal = Int(tainted)!
121121
let taintedSan = "\(taintedVal)"
122-
let q = String(format: taintedSan) // GOOD: sufficiently sanitized
122+
_ = String(format: taintedSan) // GOOD: sufficiently sanitized
123123

124124
let taintedVal2 = Int(tainted) ?? 0
125125
let taintedSan2 = String(taintedVal2)
126-
let r = String(format: taintedSan2) // GOOD: sufficiently sanitized
126+
_ = String(format: taintedSan2) // GOOD: sufficiently sanitized
127127

128128
_ = String("abc").appendingFormat("%s", "abc") // GOOD: not tainted
129129
_ = String("abc").appendingFormat("%s", tainted) // GOOD: format not tainted

0 commit comments

Comments
 (0)