Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions unified/ql/lib/codeql/unified/internal/mad/LegacyMaD.qll
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,16 @@ private string getQualifiedNameFromExpr(Expr e) {

private string getArgLabelsFromCall(CallExpr call) {
result =
concat(Argument arg, string name, int group |
concat(Argument arg, string name |
arg = call.getAnArgument() and
(
arg.isPositional() and
name = "_" and
group = 0
name = "_"
or
name = arg.getName() and
group = 1
name = arg.getName()
)
|
name + ":" order by group, name
name + ":" order by arg.getParentIndex()
)
}

Expand Down Expand Up @@ -98,18 +96,16 @@ private predicate isSubclassOfType(ClassLikeDeclaration cls, string typeName) {

private string getArgLabelsFromCallable(Callable callable) {
result =
concat(Parameter param, string name, int group |
concat(Parameter param, string name |
param.getParent() = callable and
(
param.isPositional() and
name = "_" and
group = 0
name = "_"
or
name = param.getExternalName() and
group = 1
name = param.getExternalName()
)
|
name + ":" order by group, name
name + ":" order by param.getParentIndex()
)
}

Expand Down
26 changes: 13 additions & 13 deletions unified/ql/lib/ext/format-string.model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ extensions:
pack: codeql/unified-all
extensible: legacySinkModel
data: # namespace, type, subtypes, name, signature, ext, input, kind, provenance
- ["", "String", true, "init(_:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(arguments:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(_:format:locale:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(arguments:format:locale:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(format:_:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(format:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(format:locale:_:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "init(format:locale:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "String", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "NSString", true, "init(_:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(arguments:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(_:format:locale:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(arguments:format:locale:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(format:_:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(format:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(format:locale:_:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "init(format:locale:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSString", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(_:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(arguments:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(_:format:locale:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(arguments:format:locale:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(format:_:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(format:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(format:locale:_:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "init(format:locale:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSMutableString", true, "localizedStringWithFormat(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "NSMutableString", true, "appendFormat(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "StringProtocol", true, "appendingFormat(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "NSException", true, "raise(_:arguments:format:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "NSException", true, "raise(_:format:arguments:)", "", "", "Argument[format:]", "format-string", "manual"]
- ["", "", false, "NSLog(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "", false, "NSLogv(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
- ["", "", false, "printf(_:_:)", "", "", "Argument[0]", "format-string", "manual"]
Expand Down
Loading
Loading