Swift: Fix for Int.description.

geoffw0 · geoffw0 · commit e08eac03d8c7 · 2024-11-28T18:18:23.000Z
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
@@ -167,7 +167,7 @@ private class StringFieldsInheritTaint extends TaintInheritingContent,
             "precomposedStringWithCompatibilityMapping", "removingPercentEncoding"
           ]
         or
-        namedTypeDecl.getFullName() = "CustomStringConvertible" and
+        namedTypeDecl.getFullName() = ["CustomStringConvertible", "BinaryInteger"] and
         fieldDecl.getName() = "description"
         or
         namedTypeDecl.getFullName() = "CustomDebugStringConvertible" and
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
@@ -1,5 +1,4 @@
 testFailures
 | optionset.swift:60:49:61:1 | // $ tainted=60\n | Missing result: tainted=60 |
 | optionset.swift:65:58:66:1 | // $ tainted=65\n | Missing result: tainted=65 |
-| string.swift:599:35:600:1 | // $ tainted=599\n | Missing result: tainted=599 |
 failures

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private class StringFieldsInheritTaint extends TaintInheritingContent,`
`167`	`167`	`"precomposedStringWithCompatibilityMapping", "removingPercentEncoding"`
`168`	`168`	`]`
`169`	`169`	`or`
`170`		`- namedTypeDecl.getFullName() = "CustomStringConvertible" and`
	`170`	`+ namedTypeDecl.getFullName() = ["CustomStringConvertible", "BinaryInteger"] and`
`171`	`171`	`fieldDecl.getName() = "description"`
`172`	`172`	`or`
`173`	`173`	`namedTypeDecl.getFullName() = "CustomDebugStringConvertible" and`