Skip to content

Commit cf7f355

Browse files
geoffw0geoffw0
committed
Swift: Additional test cases.
1 parent 59c43c7 commit cf7f355

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

‎swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ edges
22
| StringLengthConflation2.swift:35:36:35:38 | .count | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... |
33
| StringLengthConflation2.swift:37:34:37:36 | .count | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... |
44
| StringLengthConflation.swift:36:30:36:37 | len | StringLengthConflation.swift:36:93:36:93 | len |
5+
| StringLengthConflation.swift:36:30:36:37 | len | StringLengthConflation.swift:36:93:36:93 | len |
6+
| StringLengthConflation.swift:36:30:36:37 | len | StringLengthConflation.swift:36:93:36:93 | len |
57
| StringLengthConflation.swift:60:47:60:50 | .length | StringLengthConflation.swift:60:47:60:59 | ... ./(_:_:) ... |
68
| StringLengthConflation.swift:66:33:66:36 | .length | StringLengthConflation.swift:66:33:66:45 | ... ./(_:_:) ... |
79
| StringLengthConflation.swift:72:33:72:35 | .count | StringLengthConflation.swift:36:30:36:37 | len |
@@ -30,6 +32,9 @@ edges
3032
| StringLengthConflation.swift:178:35:178:39 | .length | StringLengthConflation.swift:178:35:178:48 | ... .-(_:_:) ... |
3133
| StringLengthConflation.swift:179:37:179:39 | .count | StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... |
3234
| StringLengthConflation.swift:181:37:181:39 | .count | StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... |
35+
| StringLengthConflation.swift:190:28:190:28 | .count | StringLengthConflation.swift:36:30:36:37 | len |
36+
| StringLengthConflation.swift:191:28:191:33 | .count | StringLengthConflation.swift:36:30:36:37 | len |
37+
| StringLengthConflation.swift:193:28:193:43 | .count | StringLengthConflation.swift:36:30:36:37 | len |
3338
| file://:0:0:0:0 | .length | StringLengthConflation.swift:53:43:53:46 | .length |
3439
| file://:0:0:0:0 | .length | StringLengthConflation.swift:60:47:60:50 | .length |
3540
| file://:0:0:0:0 | .length | StringLengthConflation.swift:66:33:66:36 | .length |
@@ -49,6 +54,10 @@ nodes
4954
| StringLengthConflation2.swift:37:34:37:36 | .count | semmle.label | .count |
5055
| StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
5156
| StringLengthConflation.swift:36:30:36:37 | len | semmle.label | len |
57+
| StringLengthConflation.swift:36:30:36:37 | len | semmle.label | len |
58+
| StringLengthConflation.swift:36:30:36:37 | len | semmle.label | len |
59+
| StringLengthConflation.swift:36:93:36:93 | len | semmle.label | len |
60+
| StringLengthConflation.swift:36:93:36:93 | len | semmle.label | len |
5261
| StringLengthConflation.swift:36:93:36:93 | len | semmle.label | len |
5362
| StringLengthConflation.swift:53:43:53:46 | .length | semmle.label | .length |
5463
| StringLengthConflation.swift:54:43:54:50 | .count | semmle.label | .count |
@@ -116,12 +125,21 @@ nodes
116125
| StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
117126
| StringLengthConflation.swift:181:37:181:39 | .count | semmle.label | .count |
118127
| StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
128+
| StringLengthConflation.swift:190:28:190:28 | .count | semmle.label | .count |
129+
| StringLengthConflation.swift:190:28:190:28 | .count | semmle.label | .count |
130+
| StringLengthConflation.swift:191:28:191:33 | .count | semmle.label | .count |
131+
| StringLengthConflation.swift:191:28:191:33 | .count | semmle.label | .count |
132+
| StringLengthConflation.swift:193:28:193:43 | .count | semmle.label | .count |
133+
| StringLengthConflation.swift:193:28:193:43 | .count | semmle.label | .count |
119134
| file://:0:0:0:0 | .length | semmle.label | .length |
120135
subpaths
121136
#select
122137
| StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... | StringLengthConflation2.swift:35:36:35:38 | .count | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... | This String length is used in an NSString, but it may not be equivalent. |
123138
| StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | StringLengthConflation2.swift:37:34:37:36 | .count | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | This String length is used in an NSString, but it may not be equivalent. |
124139
| StringLengthConflation.swift:36:93:36:93 | len | StringLengthConflation.swift:72:33:72:35 | .count | StringLengthConflation.swift:36:93:36:93 | len | This String length is used in an NSString, but it may not be equivalent. |
140+
| StringLengthConflation.swift:36:93:36:93 | len | StringLengthConflation.swift:190:28:190:28 | .count | StringLengthConflation.swift:36:93:36:93 | len | This String length is used in an NSString, but it may not be equivalent. |
141+
| StringLengthConflation.swift:36:93:36:93 | len | StringLengthConflation.swift:191:28:191:33 | .count | StringLengthConflation.swift:36:93:36:93 | len | This String.UTF8View length is used in an NSString, but it may not be equivalent. |
142+
| StringLengthConflation.swift:36:93:36:93 | len | StringLengthConflation.swift:193:28:193:43 | .count | StringLengthConflation.swift:36:93:36:93 | len | This String.UnicodeScalarView length is used in an NSString, but it may not be equivalent. |
125143
| StringLengthConflation.swift:53:43:53:46 | .length | StringLengthConflation.swift:53:43:53:46 | .length | StringLengthConflation.swift:53:43:53:46 | .length | This NSString length is used in a String, but it may not be equivalent. |
126144
| StringLengthConflation.swift:53:43:53:46 | .length | file://:0:0:0:0 | .length | StringLengthConflation.swift:53:43:53:46 | .length | This NSString length is used in a String, but it may not be equivalent. |
127145
| StringLengthConflation.swift:54:43:54:50 | .count | StringLengthConflation.swift:54:43:54:50 | .count | StringLengthConflation.swift:54:43:54:50 | .count | This String.UTF8View length is used in a String, but it may not be equivalent. |
@@ -173,3 +191,6 @@ subpaths
173191
| StringLengthConflation.swift:178:35:178:48 | ... .-(_:_:) ... | file://:0:0:0:0 | .length | StringLengthConflation.swift:178:35:178:48 | ... .-(_:_:) ... | This NSString length is used in a String.UnicodeScalarView, but it may not be equivalent. |
174192
| StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... | StringLengthConflation.swift:179:37:179:39 | .count | StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... | This String length is used in a String.UTF8View, but it may not be equivalent. |
175193
| StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... | StringLengthConflation.swift:181:37:181:39 | .count | StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... | This String length is used in a String.UTF16View, but it may not be equivalent. |
194+
| StringLengthConflation.swift:190:28:190:28 | .count | StringLengthConflation.swift:190:28:190:28 | .count | StringLengthConflation.swift:190:28:190:28 | .count | This String length is used in an NSString, but it may not be equivalent. |
195+
| StringLengthConflation.swift:191:28:191:33 | .count | StringLengthConflation.swift:191:28:191:33 | .count | StringLengthConflation.swift:191:28:191:33 | .count | This String.UTF8View length is used in an NSString, but it may not be equivalent. |
196+
| StringLengthConflation.swift:193:28:193:43 | .count | StringLengthConflation.swift:193:28:193:43 | .count | StringLengthConflation.swift:193:28:193:43 | .count | This String.UnicodeScalarView length is used in an NSString, but it may not be equivalent. |

‎swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,12 @@ func test(s: String) {
184184

185185
// `begin :thumbsup: end`, with thumbs up emoji and skin tone modifier
186186
test(s: "begin \u{0001F44D}\u{0001F3FF} end")
187+
188+
extension String {
189+
func newStringMethod() {
190+
_ = NSMakeRange(0, count) // BAD
191+
_ = NSMakeRange(0, utf8.count) // BAD
192+
_ = NSMakeRange(0, utf16.count) // GOOD (`String.UTF16View` and `NSString` lengths are equivalent)
193+
_ = NSMakeRange(0, unicodeScalars.count) // BAD
194+
}
195+
}

0 commit comments

Comments
 (0)