Swift: The regressed test is not realistic, update it to be more like what really happens.

geoffw0 · geoffw0 · commit 9529bc5f095a · 2023-03-23T10:52:58.000Z
diff --git a/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected b/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected
@@ -1,4 +1,5 @@
 edges
+| StringLengthConflation2.swift:35:36:35:38 | .count :  | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... |
 | StringLengthConflation2.swift:37:34:37:36 | .count :  | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... |
 | StringLengthConflation.swift:36:30:36:37 | len :  | StringLengthConflation.swift:36:93:36:93 | len |
 | StringLengthConflation.swift:60:47:60:50 | .length :  | StringLengthConflation.swift:60:47:60:59 | ... ./(_:_:) ... |
@@ -27,6 +28,8 @@ edges
 | file://:0:0:0:0 | .length :  | StringLengthConflation.swift:114:23:114:26 | .length :  |
 | file://:0:0:0:0 | .length :  | StringLengthConflation.swift:120:22:120:25 | .length :  |
 nodes
+| StringLengthConflation2.swift:35:36:35:38 | .count :  | semmle.label | .count :  |
+| StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
 | StringLengthConflation2.swift:37:34:37:36 | .count :  | semmle.label | .count :  |
 | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
 | StringLengthConflation.swift:36:30:36:37 | len :  | semmle.label | len :  |
@@ -76,6 +79,7 @@ nodes
 | file://:0:0:0:0 | .length :  | semmle.label | .length :  |
 subpaths
 #select
+| 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. |
 | 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. |
 | 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. |
 | 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. |
diff --git a/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation2.swift b/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation2.swift
@@ -12,12 +12,7 @@ class NSObject
 {
 }
 
-class NSStringBase : NSObject
-{
-    func substring(from: Int) -> String { return "" }
-}
-
-class NSString : NSStringBase
+class NSString : NSObject
 {
     init(string: String) { length = string.count }
 
@@ -26,6 +21,11 @@ class NSString : NSStringBase
     private(set) var length: Int
 }
 
+extension NSString
+{
+    func substring(from: Int) -> String { return "" }
+}
+
 // --- tests ---
 
 func test(s: String) {

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,7 @@ class NSObject`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`-class NSStringBase : NSObject`
`16`		`-{`
`17`		`- func substring(from: Int) -> String { return "" }`
`18`		`-}`
`19`		`-`
`20`		`-class NSString : NSStringBase`
	`15`	`+class NSString : NSObject`
`21`	`16`	`{`
`22`	`17`	`init(string: String) { length = string.count }`
`23`	`18`
`@@ -26,6 +21,11 @@ class NSString : NSStringBase`
`26`	`21`	`private(set) var length: Int`
`27`	`22`	`}`
`28`	`23`
	`24`	`+extension NSString`
	`25`	`+{`
	`26`	`+ func substring(from: Int) -> String { return "" }`
	`27`	`+}`
	`28`	`+`
`29`	`29`	`// --- tests ---`
`30`	`30`
`31`	`31`	`func test(s: String) {`