hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Simplify delegate read and store steps (remove dependency on parameter).

Browse Source
This commit is contained in:
Michael Nebel
2024-10-25 13:02:21 +02:00
parent a86cd181a6
commit 5c389355d0
3 changed files with 42 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
View File

@@ -176,10 +176,15 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, CsharpDat
* Gets the underlying type of the content `c`.
*/
private CS::Type getUnderlyingContType(DataFlow::Content c) {
result = c.(DataFlow::FieldContent).getField().getType() or
result = c.(DataFlow::SyntheticFieldContent).getField().getType() or
result = c.(DataFlow::DelegateCallArgumentContent).getType() or
result = c.(DataFlow::DelegateCallReturnContent).getType()
result = c.(DataFlow::FieldContent).getField().getType()
or
result = c.(DataFlow::SyntheticFieldContent).getField().getType()
or
// Use System.Object as the type of delegate arguments and returns as the content doesn't
// contain any type information.
c instanceof DataFlow::DelegateCallArgumentContent and result instanceof ObjectType
or
c instanceof DataFlow::DelegateCallReturnContent and result instanceof ObjectType
}
Type getUnderlyingContentType(DataFlow::ContentSet c) {
@@ -347,9 +352,9 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, CsharpDat
c.isElement() and
result = "Element"
or
exists(int i | c.isDelegateCallArgument(_, i) and result = "Parameter[" + i + "]")
exists(int i | c.isDelegateCallArgument(i) and result = "Parameter[" + i + "]")
or
c.isDelegateCallReturn(_) and result = "ReturnValue"
c.isDelegateCallReturn() and result = "ReturnValue"
}
predicate partialModel = ExternalFlow::partialModel/6;