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

C#: Fix enclosing DataFlowCallable of ObjectInitMethods with multiple bodies.

Browse Source
This commit is contained in:
Anders Schack-Mulligen
2025-12-02 13:11:00 +01:00
parent ba7b517a4a
commit 2eb2a50ccd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowDispatch.qll
View File

@@ -27,6 +27,12 @@ newtype TReturnKind =
private predicate hasMultipleSourceLocations(Callable c) { strictcount(getASourceLocation(c)) > 1 }
private predicate objectInitEntry(ObjectInitMethod m, ControlFlowElement first) {
exists(ControlFlow::Nodes::EntryNode en |
en.getCallable() = m and first.getControlFlowNode() = en.getASuccessor()
)
}
private module NearestBodyLocationInput implements NearestLocationInputSig {
class C = ControlFlowElement;
@@ -34,7 +40,7 @@ private module NearestBodyLocationInput implements NearestLocationInputSig {
exists(Callable c |
hasMultipleSourceLocations(c) and
l1 = getASourceLocation(c) and
body = c.getBody() and
(body = c.getBody() or objectInitEntry(c, body)) and
l2 = body.getLocation()
)
}
@@ -207,7 +213,9 @@ class DataFlowCallable extends TDataFlowCallable {
private ControlFlow::Nodes::ElementNode getAMultiBodyEntryNode(ControlFlow::BasicBlock bb, int i) {
this.isMultiBodied() and
exists(ControlFlowElement body, Location l |
body = this.asCallable(l).getBody() and
body = this.asCallable(l).getBody() or
objectInitEntry(this.asCallable(l), body)
|
NearestLocation<NearestBodyLocationInput>::nearestLocation(body, l, _) and
result = body.getAControlFlowEntryNode()
) and