hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18154 from geoffw0/swift6models4

Browse Source 
Swift: Fix for OptionSet and BinaryInteger models
This commit is contained in:
Geoffrey White
2024-11-29 17:30:51 +00:00
committed by GitHub
parent 14b70b856a e9deec7217
commit eeed2c22be
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
swift/ql/lib/codeql/swift/frameworks/StandardLibrary/RawRepresentable.qll
View File

@@ -12,7 +12,11 @@ private import codeql.swift.dataflow.FlowSteps
*/
private class RawRepresentableSummaries extends SummaryModelCsv {
override predicate row(string row) {
row = ";RawRepresentable;true;init(rawValue:);;;Argument[0];ReturnValue;taint"
row =
[
";RawRepresentable;true;init(rawValue:);;;Argument[0];ReturnValue;taint",
";OptionSet;true;init(rawValue:);;;Argument[0];ReturnValue;taint"
]
}
}

2
swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
View File

@@ -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

3
swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
View File

@@ -1,5 +1,2 @@
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