Skip to content

Commit 0aa9c76

Browse files
geoffw0geoffw0
committed
Swift: Grammar and formatting.
1 parent 00302dc commit 0aa9c76

File tree

1 file changed

+89
-88
lines changed
  • swift/ql/lib/codeql/swift/frameworks/StandardLibrary

1 file changed

+89
-88
lines changed

‎swift/ql/lib/codeql/swift/frameworks/StandardLibrary/NsString.qll

Lines changed: 89 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -33,98 +33,99 @@ private class NsStringSource extends SourceModelCsv {
3333
*/
3434
private class NsStringSummaries extends SummaryModelCsv {
3535
override predicate row(string row) {
36-
row = [
37-
";NSString;true;init(bytes:length:encoding:);;;Argument[0];ReturnValue;taint",
38-
";NSString;true;init(bytesNoCopy:length:encoding:freeWhenDone:);;;Argument[0];ReturnValue;taint",
39-
";NSString;true;init(bytesNoCopy:length:encoding:deallocator:);;;Argument[0];ReturnValue;taint",
40-
";NSString;true;init(characters:length:);;;Argument[0];ReturnValue;taint",
41-
";NSString;true;init(charactersNoCopy:length:freeWhenDone:);;;Argument[0];ReturnValue;taint",
42-
";NSString;true;init(charactersNoCopy:length:dellocator:);;;Argument[0];ReturnValue;taint",
43-
";NSString;true;init(string:);;;Argument[0];ReturnValue;taint",
44-
";NSString;true;init(cString:);;;Argument[0];ReturnValue;taint",
45-
";NSString;true;init(cString:encoding:);;;Argument[0];ReturnValue;taint",
46-
";NSString;true;init(cString:length:);;;Argument[0];ReturnValue;taint",
47-
";NSString;true;init(cStringNoCopy:length:freeWhenDone:);;;Argument[0];ReturnValue;taint",
48-
";NSString;true;init(utf8String:);;;Argument[0];ReturnValue;taint",
49-
";NSString;true;init(format:arguments:);;;Argument[0..1];ReturnValue;taint",
50-
";NSString;true;init(format:locale:arguments:);;;Argument[0];ReturnValue;taint",
51-
";NSString;true;init(format:locale:arguments:);;;Argument[2];ReturnValue;taint",
52-
";NSString;true;init(format:_:);;;Argument[0];ReturnValue;taint", //0..
53-
";NSString;true;init(format:locale:_:);;;Argument[0];ReturnValue;taint", //0,2..
54-
";NSString;true;init(data:encoding:);;;Argument[0];ReturnValue;taint",
55-
";NSString;true;init(contentsOfFile:);;;Argument[0];ReturnValue;taint",
56-
";NSString;true;init(contentsOfFile:encoding:);;;Argument[0];ReturnValue;taint",
57-
";NSString;true;init(contentsOfFile:usedEncoding:);;;Argument[0];ReturnValue;taint",
58-
";NSString;true;init(contentsOf:);;;Argument[0];ReturnValue;taint",
59-
";NSString;true;init(contentsOf:encoding:);;;Argument[0];ReturnValue;taint",
60-
";NSString;true;init(contentsOf:usedEncoding:);;;Argument[0];ReturnValue;taint",
61-
";NSString;true;init(coder:);;;Argument[0];ReturnValue;taint",
62-
";NSString;true;localizedStringWithFormat(_:_:);;;Argument[0];ReturnValue;taint", //0..
63-
";NSString;true;character(at:);;;Argument[-1];ReturnValue;taint",
64-
";NSString;true;getCharacters(_:);;;Argument[-1];Argument[0];taint",
65-
";NSString;true;getCharacters(_:range:);;;Argument[-1];Argument[0];taint",
66-
";NSString;true;getBytes(_:maxLength:usedLength:encoding:options:range:remaining:);;;Argument[-1];Argument[0];taint",
67-
";NSString;true;cString(using:);;;Argument[-1];ReturnValue;taint",
68-
";NSString;true;cString();;;Argument[-1];ReturnValue;taint",
69-
";NSString;true;lossyCString();;;Argument[-1];ReturnValue;taint",
70-
";NSString;true;getCString(_:);;;Argument[-1];Argument[0];taint",
71-
";NSString;true;getCString(_:maxLength:);;;Argument[-1];Argument[0];taint",
72-
";NSString;true;getCString(_:maxLength:encoding:);;;Argument[-1];Argument[0];taint",
73-
";NSString;true;getCString(_:maxLength:range:remaining:);;;Argument[-1];Argument[0];taint",
74-
";NSString;true;appendingFormat(_:_:);;;Argument[-1..0];ReturnValue;taint", // -1..
75-
";NSString;true;appending(_:);;;Argument[-1..0];ReturnValue;taint",
76-
";NSString;true;padding(toLength:withPad:startingAt:);;;Argument[-1];ReturnValue;taint",
77-
";NSString;true;padding(toLength:withPad:startingAt:);;;Argument[1];ReturnValue;taint",
78-
";NSString;true;lowercased(with:);;;Argument[-1];ReturnValue;taint",
79-
";NSString;true;uppercased(with:);;;Argument[-1];ReturnValue;taint",
80-
";NSString;true;capitalized(with:);;;Argument[-1];ReturnValue;taint",
81-
";NSString;true;components(separatedBy:);;;Argument[-1];ReturnValue;taint",
82-
";NSString;true;trimmingCharacters(in:);;;Argument[-1];ReturnValue;taint",
83-
";NSString;true;substring(from:);;;Argument[-1];ReturnValue;taint",
84-
";NSString;true;substring(with:);;;Argument[-1];ReturnValue;taint",
85-
";NSString;true;substring(to:);;;Argument[-1];ReturnValue;taint",
86-
";NSString;true;folding(options:locale:);;;Argument[-1];ReturnValue;taint",
87-
";NSString;true;applyingTransform(_:reverse:);;;Argument[-1];ReturnValue;taint",
88-
";NSString;true;replacingOccurrences(of:with:);;;Argument[-1];ReturnValue;taint",
89-
";NSString;true;replacingOccurrences(of:with:);;;Argument[1];ReturnValue;taint",
90-
";NSString;true;replacingOccurrences(of:with:);;;Argument[-1];ReturnValue;taint",
91-
";NSString;true;replacingOccurrences(of:with:);;;Argument[1];ReturnValue;taint",
92-
";NSString;true;replacingCharacters(in:with:);;;Argument[-1];ReturnValue;taint",
93-
";NSString;true;replacingCharacters(in:with:);;;Argument[1];ReturnValue;taint",
94-
";NSString;true;propertyList();;;Argument[-1];ReturnValue;taint",
95-
";NSString;true;propertyListFromStringsFileFormat();;;Argument[-1];ReturnValue;taint",
96-
";NSString;true;variantFittingPresentationWidth(_:);;;Argument[-1];ReturnValue;taint",
97-
";NSString;true;stringEncoding(for:encodingOptions:convertedString:usedLossyCompression:);;;Argument[0];Argument[2];taint",
98-
";NSString;true;data(using:);;;Argument[-1];ReturnValue;taint",
99-
";NSString;true;data(using:allowLossyConversion:);;;Argument[-1];ReturnValue;taint",
100-
";NSString;true;path(withComponents:);;;Argument[0];ReturnValue;taint",
101-
";NSString;true;completePath(into:caseSensitive:matchesInto:filterTypes:);;;Argument[-1];Argument[0];taint",
102-
";NSString;true;completePath(into:caseSensitive:matchesInto:filterTypes:);;;Argument[-1];Argument[2];taint",
103-
";NSString;true;getFileSystemRepresentation(_:maxLength:);;;Argument[-1];Argument[0];taint",
104-
";NSString;true;appendingPathComponent(_:);;;Argument[-1..0];ReturnValue;taint",
105-
";NSString;true;appendingPathComponent(_:conformingTo:);;;Argument[-1..0];ReturnValue;taint",
106-
";NSString;true;appendingPathExtension(_:);;;Argument[-1..0];ReturnValue;taint",
107-
";NSString;true;strings(byAppendingPaths:);;;Argument[-1..0];ReturnValue;taint",
108-
";NSString;true;addingPercentEncoding(withAllowedCharacters:);;;Argument[-1];ReturnValue;taint",
109-
";NSString;true;string(withCString:);;;Argument[0];ReturnValue;taint",
110-
";NSString;true;string(withCString:length:);;;Argument[0];ReturnValue;taint",
111-
";NSString;true;string(withContentsOfFile:);;;Argument[0];ReturnValue;taint",
112-
";NSString;true;string(withContentsOf:);;;Argument[0];ReturnValue;taint",
113-
";NSString;true;addingPercentEscapes(using:);;;Argument[-1];ReturnValue;taint",
114-
";NSString;true;replacingPercentEscapes(using:);;;Argument[-1];ReturnValue;taint",
115-
";NSString;true;applyTransform(_:reverse:range:updatedRange:);;;Argument[-1];ReturnValue;taint",
116-
";NSMutableString;true;append(_:);;;Argument[0];Argument[-1];taint",
117-
";NSMutableString;true;insert(_:at:);;;Argument[0];Argument[-1];taint",
118-
";NSMutableString;true;replaceCharacters(in:with:);;;Argument[1];Argument[-1];taint",
119-
";NSMutableString;true;replaceOccurrences(of:with:options:range:);;;Argument[1];Argument[-1];taint",
120-
";NSMutableString;true;setString(_:);;;Argument[0];Argument[-1];taint",
121-
";NSMutableString;true;appendFormat(_:_:);;;Argument[0];Argument[-1];taint", //0..
122-
]
36+
row =
37+
[
38+
";NSString;true;init(bytes:length:encoding:);;;Argument[0];ReturnValue;taint",
39+
";NSString;true;init(bytesNoCopy:length:encoding:freeWhenDone:);;;Argument[0];ReturnValue;taint",
40+
";NSString;true;init(bytesNoCopy:length:encoding:deallocator:);;;Argument[0];ReturnValue;taint",
41+
";NSString;true;init(characters:length:);;;Argument[0];ReturnValue;taint",
42+
";NSString;true;init(charactersNoCopy:length:freeWhenDone:);;;Argument[0];ReturnValue;taint",
43+
";NSString;true;init(charactersNoCopy:length:dellocator:);;;Argument[0];ReturnValue;taint",
44+
";NSString;true;init(string:);;;Argument[0];ReturnValue;taint",
45+
";NSString;true;init(cString:);;;Argument[0];ReturnValue;taint",
46+
";NSString;true;init(cString:encoding:);;;Argument[0];ReturnValue;taint",
47+
";NSString;true;init(cString:length:);;;Argument[0];ReturnValue;taint",
48+
";NSString;true;init(cStringNoCopy:length:freeWhenDone:);;;Argument[0];ReturnValue;taint",
49+
";NSString;true;init(utf8String:);;;Argument[0];ReturnValue;taint",
50+
";NSString;true;init(format:arguments:);;;Argument[0..1];ReturnValue;taint",
51+
";NSString;true;init(format:locale:arguments:);;;Argument[0];ReturnValue;taint",
52+
";NSString;true;init(format:locale:arguments:);;;Argument[2];ReturnValue;taint",
53+
";NSString;true;init(format:_:);;;Argument[0];ReturnValue;taint", //0..
54+
";NSString;true;init(format:locale:_:);;;Argument[0];ReturnValue;taint", //0,2..
55+
";NSString;true;init(data:encoding:);;;Argument[0];ReturnValue;taint",
56+
";NSString;true;init(contentsOfFile:);;;Argument[0];ReturnValue;taint",
57+
";NSString;true;init(contentsOfFile:encoding:);;;Argument[0];ReturnValue;taint",
58+
";NSString;true;init(contentsOfFile:usedEncoding:);;;Argument[0];ReturnValue;taint",
59+
";NSString;true;init(contentsOf:);;;Argument[0];ReturnValue;taint",
60+
";NSString;true;init(contentsOf:encoding:);;;Argument[0];ReturnValue;taint",
61+
";NSString;true;init(contentsOf:usedEncoding:);;;Argument[0];ReturnValue;taint",
62+
";NSString;true;init(coder:);;;Argument[0];ReturnValue;taint",
63+
";NSString;true;localizedStringWithFormat(_:_:);;;Argument[0];ReturnValue;taint", //0..
64+
";NSString;true;character(at:);;;Argument[-1];ReturnValue;taint",
65+
";NSString;true;getCharacters(_:);;;Argument[-1];Argument[0];taint",
66+
";NSString;true;getCharacters(_:range:);;;Argument[-1];Argument[0];taint",
67+
";NSString;true;getBytes(_:maxLength:usedLength:encoding:options:range:remaining:);;;Argument[-1];Argument[0];taint",
68+
";NSString;true;cString(using:);;;Argument[-1];ReturnValue;taint",
69+
";NSString;true;cString();;;Argument[-1];ReturnValue;taint",
70+
";NSString;true;lossyCString();;;Argument[-1];ReturnValue;taint",
71+
";NSString;true;getCString(_:);;;Argument[-1];Argument[0];taint",
72+
";NSString;true;getCString(_:maxLength:);;;Argument[-1];Argument[0];taint",
73+
";NSString;true;getCString(_:maxLength:encoding:);;;Argument[-1];Argument[0];taint",
74+
";NSString;true;getCString(_:maxLength:range:remaining:);;;Argument[-1];Argument[0];taint",
75+
";NSString;true;appendingFormat(_:_:);;;Argument[-1..0];ReturnValue;taint", // -1..
76+
";NSString;true;appending(_:);;;Argument[-1..0];ReturnValue;taint",
77+
";NSString;true;padding(toLength:withPad:startingAt:);;;Argument[-1];ReturnValue;taint",
78+
";NSString;true;padding(toLength:withPad:startingAt:);;;Argument[1];ReturnValue;taint",
79+
";NSString;true;lowercased(with:);;;Argument[-1];ReturnValue;taint",
80+
";NSString;true;uppercased(with:);;;Argument[-1];ReturnValue;taint",
81+
";NSString;true;capitalized(with:);;;Argument[-1];ReturnValue;taint",
82+
";NSString;true;components(separatedBy:);;;Argument[-1];ReturnValue;taint",
83+
";NSString;true;trimmingCharacters(in:);;;Argument[-1];ReturnValue;taint",
84+
";NSString;true;substring(from:);;;Argument[-1];ReturnValue;taint",
85+
";NSString;true;substring(with:);;;Argument[-1];ReturnValue;taint",
86+
";NSString;true;substring(to:);;;Argument[-1];ReturnValue;taint",
87+
";NSString;true;folding(options:locale:);;;Argument[-1];ReturnValue;taint",
88+
";NSString;true;applyingTransform(_:reverse:);;;Argument[-1];ReturnValue;taint",
89+
";NSString;true;replacingOccurrences(of:with:);;;Argument[-1];ReturnValue;taint",
90+
";NSString;true;replacingOccurrences(of:with:);;;Argument[1];ReturnValue;taint",
91+
";NSString;true;replacingOccurrences(of:with:);;;Argument[-1];ReturnValue;taint",
92+
";NSString;true;replacingOccurrences(of:with:);;;Argument[1];ReturnValue;taint",
93+
";NSString;true;replacingCharacters(in:with:);;;Argument[-1];ReturnValue;taint",
94+
";NSString;true;replacingCharacters(in:with:);;;Argument[1];ReturnValue;taint",
95+
";NSString;true;propertyList();;;Argument[-1];ReturnValue;taint",
96+
";NSString;true;propertyListFromStringsFileFormat();;;Argument[-1];ReturnValue;taint",
97+
";NSString;true;variantFittingPresentationWidth(_:);;;Argument[-1];ReturnValue;taint",
98+
";NSString;true;stringEncoding(for:encodingOptions:convertedString:usedLossyCompression:);;;Argument[0];Argument[2];taint",
99+
";NSString;true;data(using:);;;Argument[-1];ReturnValue;taint",
100+
";NSString;true;data(using:allowLossyConversion:);;;Argument[-1];ReturnValue;taint",
101+
";NSString;true;path(withComponents:);;;Argument[0];ReturnValue;taint",
102+
";NSString;true;completePath(into:caseSensitive:matchesInto:filterTypes:);;;Argument[-1];Argument[0];taint",
103+
";NSString;true;completePath(into:caseSensitive:matchesInto:filterTypes:);;;Argument[-1];Argument[2];taint",
104+
";NSString;true;getFileSystemRepresentation(_:maxLength:);;;Argument[-1];Argument[0];taint",
105+
";NSString;true;appendingPathComponent(_:);;;Argument[-1..0];ReturnValue;taint",
106+
";NSString;true;appendingPathComponent(_:conformingTo:);;;Argument[-1..0];ReturnValue;taint",
107+
";NSString;true;appendingPathExtension(_:);;;Argument[-1..0];ReturnValue;taint",
108+
";NSString;true;strings(byAppendingPaths:);;;Argument[-1..0];ReturnValue;taint",
109+
";NSString;true;addingPercentEncoding(withAllowedCharacters:);;;Argument[-1];ReturnValue;taint",
110+
";NSString;true;string(withCString:);;;Argument[0];ReturnValue;taint",
111+
";NSString;true;string(withCString:length:);;;Argument[0];ReturnValue;taint",
112+
";NSString;true;string(withContentsOfFile:);;;Argument[0];ReturnValue;taint",
113+
";NSString;true;string(withContentsOf:);;;Argument[0];ReturnValue;taint",
114+
";NSString;true;addingPercentEscapes(using:);;;Argument[-1];ReturnValue;taint",
115+
";NSString;true;replacingPercentEscapes(using:);;;Argument[-1];ReturnValue;taint",
116+
";NSString;true;applyTransform(_:reverse:range:updatedRange:);;;Argument[-1];ReturnValue;taint",
117+
";NSMutableString;true;append(_:);;;Argument[0];Argument[-1];taint",
118+
";NSMutableString;true;insert(_:at:);;;Argument[0];Argument[-1];taint",
119+
";NSMutableString;true;replaceCharacters(in:with:);;;Argument[1];Argument[-1];taint",
120+
";NSMutableString;true;replaceOccurrences(of:with:options:range:);;;Argument[1];Argument[-1];taint",
121+
";NSMutableString;true;setString(_:);;;Argument[0];Argument[-1];taint",
122+
";NSMutableString;true;appendFormat(_:_:);;;Argument[0];Argument[-1];taint", //0..
123+
]
123124
}
124125
}
125126

126127
/**
127-
* A content implying that, if a `NsString` is tainted, then many of its fields are
128+
* A content implying that, if an `NSString` is tainted, then many of its fields are
128129
* tainted.
129130
*/
130131
private class NsStringFieldsInheritTaint extends TaintInheritingContent,

0 commit comments

Comments
 (0)