Dataflow: Sync DataFlowImplCommon

RasmusWL · RasmusWL · commit 911ddb9b2c4b · 2022-05-24T17:39:23.000+02:00
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
@@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) {
 pragma[noinline]
 predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) {
   exists(ArgumentPosition apos |
-    arg.argumentOf(call, apos) and
-    parameterMatch(ppos, apos)
+    arg.argumentOf(call, pragma[only_bind_into](apos)) and
+    parameterMatch(ppos, pragma[only_bind_into](apos))
   )
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
@@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) {
 pragma[noinline]
 predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) {
   exists(ArgumentPosition apos |
-    arg.argumentOf(call, apos) and
-    parameterMatch(ppos, apos)
+    arg.argumentOf(call, pragma[only_bind_into](apos)) and
+    parameterMatch(ppos, pragma[only_bind_into](apos))
   )
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
@@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) {
 pragma[noinline]
 predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) {
   exists(ArgumentPosition apos |
-    arg.argumentOf(call, apos) and
-    parameterMatch(ppos, apos)
+    arg.argumentOf(call, pragma[only_bind_into](apos)) and
+    parameterMatch(ppos, pragma[only_bind_into](apos))
   )
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
@@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) {
 pragma[noinline]
 predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) {
   exists(ArgumentPosition apos |
-    arg.argumentOf(call, apos) and
-    parameterMatch(ppos, apos)
+    arg.argumentOf(call, pragma[only_bind_into](apos)) and
+    parameterMatch(ppos, pragma[only_bind_into](apos))
   )
 }
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll
@@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) {
 pragma[noinline]
 predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) {
   exists(ArgumentPosition apos |
-    arg.argumentOf(call, apos) and
-    parameterMatch(ppos, apos)
+    arg.argumentOf(call, pragma[only_bind_into](apos)) and
+    parameterMatch(ppos, pragma[only_bind_into](apos))
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) {`
`80`	`80`	`pragma[noinline]`
`81`	`81`	`predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) {`
`82`	`82`	`exists(ArgumentPosition apos \|`
`83`		`- arg.argumentOf(call, apos) and`
`84`		`- parameterMatch(ppos, apos)`
	`83`	`+ arg.argumentOf(call, pragma[only_bind_into](apos)) and`
	`84`	`+ parameterMatch(ppos, pragma[only_bind_into](apos))`
`85`	`85`	`)`
`86`	`86`	`}`
`87`	`87`