C#: Fix DataFlow::Node::getEnclosingCallable for field initializer expressions

hvitved · hvitved · commit f5a47126b177 · 2021-12-17T13:14:11.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -65,7 +65,9 @@ abstract class NodeImpl extends Node {
 
 private class ExprNodeImpl extends ExprNode, NodeImpl {
   override DataFlowCallable getEnclosingCallableImpl() {
-    result = this.getExpr().getEnclosingCallable()
+    result = this.getExpr().(CIL::Expr).getEnclosingCallable()
+    or
+    result = this.getControlFlowNodeImpl().getEnclosingCallable()
   }
 
   override DotNet::Type getTypeImpl() {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,9 @@ abstract class NodeImpl extends Node {`
`65`	`65`
`66`	`66`	`private class ExprNodeImpl extends ExprNode, NodeImpl {`
`67`	`67`	`override DataFlowCallable getEnclosingCallableImpl() {`
`68`		`- result = this.getExpr().getEnclosingCallable()`
	`68`	`+ result = this.getExpr().(CIL::Expr).getEnclosingCallable()`
	`69`	`+ or`
	`70`	`+ result = this.getControlFlowNodeImpl().getEnclosingCallable()`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`override DotNet::Type getTypeImpl() {`