Merge pull request github#3400 from jbj/fieldFlow-join-order

MathiasVP · web-flow · commit a98135093f5e · 2020-05-04T17:07:55.000+02:00
C++: Fix fieldFlow join order
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
@@ -655,7 +655,7 @@ private module FieldFlow {
     exists(FieldConfiguration cfg | cfg.hasFlow(node1, node2)) and
     // This configuration should not be able to cross function boundaries, but
     // we double-check here just to be sure.
-    node1.getFunction() = node2.getFunction()
+    node1.getEnclosingCallable() = node2.getEnclosingCallable()
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ private module FieldFlow {`
`655`	`655`	`exists(FieldConfiguration cfg \| cfg.hasFlow(node1, node2)) and`
`656`	`656`	`// This configuration should not be able to cross function boundaries, but`
`657`	`657`	`// we double-check here just to be sure.`
`658`		`- node1.getFunction() = node2.getFunction()`
	`658`	`+ node1.getEnclosingCallable() = node2.getEnclosingCallable()`
`659`	`659`	`}`
`660`	`660`	`}`
`661`	`661`