Skip to content

Commit 4356d35

Browse files
authored
Merge pull request github#12226 from geoffw0/stringfix
Swift: Fix minor mistakes in the String models.
2 parents 39e7bba + a894fc6 commit 4356d35

File tree

4 files changed

+1891
-1819
lines changed

4 files changed

+1891
-1819
lines changed

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ private class StringSummaries extends SummaryModelCsv {
5858
";StringProtocol;true;propertyListFromStringsFileFormat();;;Argument[-1];ReturnValue;taint",
5959
";StringProtocol;true;replacingCharacters(in:with:);;;Argument[-1];ReturnValue;taint",
6060
";StringProtocol;true;replacingCharacters(in:with:);;;Argument[1];ReturnValue;taint",
61-
";StringProtocol;true;replacingOccurrences(of:with:options:range);;;Argument[-1];ReturnValue;taint",
62-
";StringProtocol;true;replacingOccurrences(of:with:options:range);;;Argument[1];ReturnValue;taint",
61+
";StringProtocol;true;replacingOccurrences(of:with:options:range:);;;Argument[-1];ReturnValue;taint",
62+
";StringProtocol;true;replacingOccurrences(of:with:options:range:);;;Argument[1];ReturnValue;taint",
6363
";StringProtocol;true;replacingPercentEscapes(using:);;;Argument[-1];ReturnValue;taint",
6464
";StringProtocol;true;substring(from:);;;Argument[-1];ReturnValue;taint",
6565
";StringProtocol;true;substring(with:);;;Argument[-1];ReturnValue;taint",
@@ -79,7 +79,7 @@ private class StringSummaries extends SummaryModelCsv {
7979
";String;true;init(format:locale:arguments:);;;Argument[0];ReturnValue;taint",
8080
";String;true;init(_:radix:uppercase:);;;Argument[0];ReturnValue;taint",
8181
";String;true;init(bytes:encoding:);;;Argument[0];ReturnValue;taint",
82-
";String;true;init(bytesNoCopy:length:encoding:freeWhenDone);;;Argument[0];ReturnValue;taint",
82+
";String;true;init(bytesNoCopy:length:encoding:freeWhenDone:);;;Argument[0];ReturnValue;taint",
8383
";String;true;init(describing:);;;Argument[0];ReturnValue;taint",
8484
";String;true;init(contentsOf:);;;Argument[0];ReturnValue;taint",
8585
";String;true;init(contentsOf:encoding:);;;Argument[0];ReturnValue;taint",
@@ -101,7 +101,7 @@ private class StringSummaries extends SummaryModelCsv {
101101
";String;true;write(_:);;;Argument[0];Argument[-1];taint",
102102
";String;true;write(to:);;;Argument[-1];Argument[0];taint",
103103
";String;true;insert(contentsOf:at:);;;Argument[0];Argument[-1];taint",
104-
";String;true;replaceSubrange(_:with::);;;Argument[1];Argument[-1];taint",
104+
";String;true;replaceSubrange(_:with:);;;Argument[1];Argument[-1];taint",
105105
";String;true;max();;;Argument[-1];ReturnValue;taint",
106106
";String;true;max(by:);;;Argument[-1];ReturnValue;taint",
107107
";String;true;min();;;Argument[-1];ReturnValue;taint",

0 commit comments

Comments
 (0)