Skip to content

Commit a2fc92b

Browse files
hvitvedhvitved
committed
Data flow: Address review comments
1 parent e518cba commit a2fc92b

File tree

21 files changed

+105
-105
lines changed

21 files changed

+105
-105
lines changed

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

‎csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,15 +1713,15 @@ private predicate flowFwd0(
17131713
)
17141714
or
17151715
// flow into a callable
1716-
flowFwdIn(_, node, cc, _, _, apf, ap, config) and
1716+
flowFwdIn(_, node, _, cc, _, apf, ap, config) and
17171717
if flowCand(node, true, _, apf, config)
17181718
then argAp = TAccessPathSome(ap)
17191719
else argAp = TAccessPathNone()
17201720
or
17211721
// flow out of a callable
17221722
exists(DataFlowCall call |
1723-
exists(CallContextNoCall innercc, DataFlowCallable c |
1724-
flowFwdOut(call, node, innercc, c, argAp, apf, ap, config) and
1723+
exists(DataFlowCallable c |
1724+
flowFwdOut(call, node, any(CallContextNoCall innercc), c, argAp, apf, ap, config) and
17251725
if reducedViableImplInReturn(c, call) then cc = TReturn(c, call) else cc = TAnyCallContext()
17261726
)
17271727
or
@@ -1806,7 +1806,7 @@ private predicate flowFwdConsCand(
18061806

18071807
pragma[nomagic]
18081808
private predicate flowFwdIn(
1809-
DataFlowCall call, ParameterNode p, CallContext innercc, CallContext outercc,
1809+
DataFlowCall call, ParameterNode p, CallContext outercc, CallContext innercc,
18101810
AccessPathOption argAp, AccessPathFront apf, AccessPath ap, Configuration config
18111811
) {
18121812
exists(ArgumentNode arg, boolean allowsFieldFlow, DataFlowCallable c |
@@ -1857,7 +1857,7 @@ private predicate flowFwdIsEntered(
18571857
DataFlowCall call, CallContext cc, AccessPathOption argAp, AccessPath ap, Configuration config
18581858
) {
18591859
exists(ParameterNode p, AccessPathFront apf |
1860-
flowFwdIn(call, p, _, cc, argAp, apf, ap, config) and
1860+
flowFwdIn(call, p, cc, _, argAp, apf, ap, config) and
18611861
flowCand(p, true, TAccessPathFrontSome(_), apf, config)
18621862
)
18631863
}

0 commit comments

Comments
 (0)