diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll index 59ece3ead6f..a13c7cd1224 100644 --- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll +++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll @@ -752,22 +752,22 @@ module Private { /** * Holds if `p` can reach `n` in a summarized callable, using only value-preserving - * local steps. `clearsOrExcepts` records whether any node on the path from `p` to + * local steps. `clearsOrExpects` records whether any node on the path from `p` to * `n` either clears or expects contents. */ - private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExcepts) { + private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExpects) { viableParam(_, _, _, p) and n = p and - clearsOrExcepts = false + clearsOrExpects = false or - exists(Node mid, boolean clearsOrExceptsMid | - paramReachesLocal(p, mid, clearsOrExceptsMid) and + exists(Node mid, boolean clearsOrExpectsMid | + paramReachesLocal(p, mid, clearsOrExpectsMid) and summaryLocalStep(mid, n, true) and if summaryClearsContent(n, _) or summaryExpectsContent(n, _) - then clearsOrExcepts = true - else clearsOrExcepts = clearsOrExceptsMid + then clearsOrExpects = true + else clearsOrExpects = clearsOrExpectsMid ) } diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll index 59ece3ead6f..a13c7cd1224 100644 --- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll +++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll @@ -752,22 +752,22 @@ module Private { /** * Holds if `p` can reach `n` in a summarized callable, using only value-preserving - * local steps. `clearsOrExcepts` records whether any node on the path from `p` to + * local steps. `clearsOrExpects` records whether any node on the path from `p` to * `n` either clears or expects contents. */ - private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExcepts) { + private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExpects) { viableParam(_, _, _, p) and n = p and - clearsOrExcepts = false + clearsOrExpects = false or - exists(Node mid, boolean clearsOrExceptsMid | - paramReachesLocal(p, mid, clearsOrExceptsMid) and + exists(Node mid, boolean clearsOrExpectsMid | + paramReachesLocal(p, mid, clearsOrExpectsMid) and summaryLocalStep(mid, n, true) and if summaryClearsContent(n, _) or summaryExpectsContent(n, _) - then clearsOrExcepts = true - else clearsOrExcepts = clearsOrExceptsMid + then clearsOrExpects = true + else clearsOrExpects = clearsOrExpectsMid ) } diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll index 59ece3ead6f..a13c7cd1224 100644 --- a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll +++ b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll @@ -752,22 +752,22 @@ module Private { /** * Holds if `p` can reach `n` in a summarized callable, using only value-preserving - * local steps. `clearsOrExcepts` records whether any node on the path from `p` to + * local steps. `clearsOrExpects` records whether any node on the path from `p` to * `n` either clears or expects contents. */ - private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExcepts) { + private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExpects) { viableParam(_, _, _, p) and n = p and - clearsOrExcepts = false + clearsOrExpects = false or - exists(Node mid, boolean clearsOrExceptsMid | - paramReachesLocal(p, mid, clearsOrExceptsMid) and + exists(Node mid, boolean clearsOrExpectsMid | + paramReachesLocal(p, mid, clearsOrExpectsMid) and summaryLocalStep(mid, n, true) and if summaryClearsContent(n, _) or summaryExpectsContent(n, _) - then clearsOrExcepts = true - else clearsOrExcepts = clearsOrExceptsMid + then clearsOrExpects = true + else clearsOrExpects = clearsOrExpectsMid ) } diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll index 59ece3ead6f..a13c7cd1224 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll @@ -752,22 +752,22 @@ module Private { /** * Holds if `p` can reach `n` in a summarized callable, using only value-preserving - * local steps. `clearsOrExcepts` records whether any node on the path from `p` to + * local steps. `clearsOrExpects` records whether any node on the path from `p` to * `n` either clears or expects contents. */ - private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExcepts) { + private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExpects) { viableParam(_, _, _, p) and n = p and - clearsOrExcepts = false + clearsOrExpects = false or - exists(Node mid, boolean clearsOrExceptsMid | - paramReachesLocal(p, mid, clearsOrExceptsMid) and + exists(Node mid, boolean clearsOrExpectsMid | + paramReachesLocal(p, mid, clearsOrExpectsMid) and summaryLocalStep(mid, n, true) and if summaryClearsContent(n, _) or summaryExpectsContent(n, _) - then clearsOrExcepts = true - else clearsOrExcepts = clearsOrExceptsMid + then clearsOrExpects = true + else clearsOrExpects = clearsOrExpectsMid ) } diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll index 59ece3ead6f..a13c7cd1224 100644 --- a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll +++ b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll @@ -752,22 +752,22 @@ module Private { /** * Holds if `p` can reach `n` in a summarized callable, using only value-preserving - * local steps. `clearsOrExcepts` records whether any node on the path from `p` to + * local steps. `clearsOrExpects` records whether any node on the path from `p` to * `n` either clears or expects contents. */ - private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExcepts) { + private predicate paramReachesLocal(ParamNode p, Node n, boolean clearsOrExpects) { viableParam(_, _, _, p) and n = p and - clearsOrExcepts = false + clearsOrExpects = false or - exists(Node mid, boolean clearsOrExceptsMid | - paramReachesLocal(p, mid, clearsOrExceptsMid) and + exists(Node mid, boolean clearsOrExpectsMid | + paramReachesLocal(p, mid, clearsOrExpectsMid) and summaryLocalStep(mid, n, true) and if summaryClearsContent(n, _) or summaryExpectsContent(n, _) - then clearsOrExcepts = true - else clearsOrExcepts = clearsOrExceptsMid + then clearsOrExpects = true + else clearsOrExpects = clearsOrExpectsMid ) }