Swift: Work around toString change.

geoffw0 · geoffw0 · commit 19026e9ed57e · 2022-06-22T19:16:09.000+01:00
diff --git a/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql b/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql
@@ -71,7 +71,7 @@ predicate isSink0(Expr e) {
     // `NSMakeRange`
     funcName = "NSMakeRange" and
     argName = ["loc", "len"] and
-    call.getStaticTarget().getName() = funcName and
+    call.getStaticTarget().getName().matches(funcName + "%") and
     call.getStaticTarget().getParam(arg).getName() = argName and
     call.getArgument(arg).getExpr() = e
   )
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,6 +1,8 @@
 edges
 nodes
+| StringLengthConflation.swift:72:33:72:35 | .count | semmle.label | .count |
 | StringLengthConflation.swift:78:47:78:49 | .count | semmle.label | .count |
 subpaths
 #select
+| StringLengthConflation.swift:72:33:72:35 | .count | StringLengthConflation.swift:72:33:72:35 | .count | StringLengthConflation.swift:72:33:72:35 | .count | RESULT |
 | StringLengthConflation.swift:78:47:78:49 | .count | StringLengthConflation.swift:78:47:78:49 | .count | StringLengthConflation.swift:78:47:78:49 | .count | RESULT |

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ predicate isSink0(Expr e) {`
`71`	`71`	// `NSMakeRange`
`72`	`72`	`funcName = "NSMakeRange" and`
`73`	`73`	`argName = ["loc", "len"] and`
`74`		`- call.getStaticTarget().getName() = funcName and`
	`74`	`+ call.getStaticTarget().getName().matches(funcName + "%") and`
`75`	`75`	`call.getStaticTarget().getParam(arg).getName() = argName and`
`76`	`76`	`call.getArgument(arg).getExpr() = e`
`77`	`77`	`)`