C++/C#/Java: Change another caller of localFlow

There was also a use of `localFlowStep` in `DataFlowImplCommon` that
should now be `simpleLocalFlowStep`.
This commit is contained in:
Jonas Jensen
2019-08-21 10:20:15 +02:00
parent ec2cc5a80e
commit 6fc3a62edb
4 changed files with 12 additions and 12 deletions

View File

@@ -35,7 +35,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlowNoCtx(p, mid) and parameterValueFlowNoCtx(p, mid) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -152,7 +152,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlow(p, mid, cc) and parameterValueFlow(p, mid, cc) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -209,7 +209,7 @@ private module ImplCommon {
* through a value-preserving method. * through a value-preserving method.
*/ */
private predicate localValueStep(Node node1, Node node2) { private predicate localValueStep(Node node1, Node node2) {
localFlowStep(node1, node2) or simpleLocalFlowStep(node1, node2) or
argumentValueFlowsThrough(node1, node2, _) argumentValueFlowsThrough(node1, node2, _)
} }

View File

@@ -35,7 +35,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlowNoCtx(p, mid) and parameterValueFlowNoCtx(p, mid) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -152,7 +152,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlow(p, mid, cc) and parameterValueFlow(p, mid, cc) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -209,7 +209,7 @@ private module ImplCommon {
* through a value-preserving method. * through a value-preserving method.
*/ */
private predicate localValueStep(Node node1, Node node2) { private predicate localValueStep(Node node1, Node node2) {
localFlowStep(node1, node2) or simpleLocalFlowStep(node1, node2) or
argumentValueFlowsThrough(node1, node2, _) argumentValueFlowsThrough(node1, node2, _)
} }

View File

@@ -35,7 +35,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlowNoCtx(p, mid) and parameterValueFlowNoCtx(p, mid) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -152,7 +152,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlow(p, mid, cc) and parameterValueFlow(p, mid, cc) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -209,7 +209,7 @@ private module ImplCommon {
* through a value-preserving method. * through a value-preserving method.
*/ */
private predicate localValueStep(Node node1, Node node2) { private predicate localValueStep(Node node1, Node node2) {
localFlowStep(node1, node2) or simpleLocalFlowStep(node1, node2) or
argumentValueFlowsThrough(node1, node2, _) argumentValueFlowsThrough(node1, node2, _)
} }

View File

@@ -35,7 +35,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlowNoCtx(p, mid) and parameterValueFlowNoCtx(p, mid) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -152,7 +152,7 @@ private module ImplCommon {
or or
exists(Node mid | exists(Node mid |
parameterValueFlow(p, mid, cc) and parameterValueFlow(p, mid, cc) and
localFlowStep(mid, node) and simpleLocalFlowStep(mid, node) and
compatibleTypes(p.getType(), node.getType()) compatibleTypes(p.getType(), node.getType())
) )
or or
@@ -209,7 +209,7 @@ private module ImplCommon {
* through a value-preserving method. * through a value-preserving method.
*/ */
private predicate localValueStep(Node node1, Node node2) { private predicate localValueStep(Node node1, Node node2) {
localFlowStep(node1, node2) or simpleLocalFlowStep(node1, node2) or
argumentValueFlowsThrough(node1, node2, _) argumentValueFlowsThrough(node1, node2, _)
} }