From b12561865a1ea679db16635fc7d6b1598a6a5260 Mon Sep 17 00:00:00 2001 From: Tom Hvitved Date: Thu, 14 Oct 2021 13:41:48 +0200 Subject: [PATCH] Bump `codeql` submodule --- codeql | 2 +- .../ruby/dataflow/internal/DataFlowImplCommon.qll | 4 ++-- .../internal/tainttracking1/TaintTrackingImpl.qll | 12 +++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/codeql b/codeql index 878203f1d0e..10d6803b056 160000 --- a/codeql +++ b/codeql @@ -1 +1 @@ -Subproject commit 878203f1d0e02c163b3633eede546a4b97a8f369 +Subproject commit 10d6803b05613a9ab24e692a0f761d0b2dad7809 diff --git a/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll b/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll index f43a550af57..494780d2e1b 100644 --- a/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll +++ b/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll @@ -937,7 +937,7 @@ class CallContextSpecificCall extends CallContextCall, TSpecificCall { } override predicate relevantFor(DataFlowCallable callable) { - recordDataFlowCallSite(getCall(), callable) + recordDataFlowCallSite(this.getCall(), callable) } override predicate matchesCall(DataFlowCall call) { call = this.getCall() } @@ -1257,7 +1257,7 @@ abstract class AccessPathFront extends TAccessPathFront { TypedContent getHead() { this = TFrontHead(result) } - predicate isClearedAt(Node n) { clearsContentCached(n, getHead().getContent()) } + predicate isClearedAt(Node n) { clearsContentCached(n, this.getHead().getContent()) } } class AccessPathFrontNil extends AccessPathFront, TFrontNil { diff --git a/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll index f4f73b8247c..acb029c23d9 100644 --- a/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll +++ b/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll @@ -75,24 +75,26 @@ abstract class Configuration extends DataFlow::Configuration { predicate isSanitizer(DataFlow::Node node) { none() } final override predicate isBarrier(DataFlow::Node node) { - isSanitizer(node) or + this.isSanitizer(node) or defaultTaintSanitizer(node) } /** Holds if taint propagation into `node` is prohibited. */ predicate isSanitizerIn(DataFlow::Node node) { none() } - final override predicate isBarrierIn(DataFlow::Node node) { isSanitizerIn(node) } + final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) } /** Holds if taint propagation out of `node` is prohibited. */ predicate isSanitizerOut(DataFlow::Node node) { none() } - final override predicate isBarrierOut(DataFlow::Node node) { isSanitizerOut(node) } + final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) } /** Holds if taint propagation through nodes guarded by `guard` is prohibited. */ predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() } - final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) { isSanitizerGuard(guard) } + final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) { + this.isSanitizerGuard(guard) + } /** * Holds if the additional taint propagation step from `node1` to `node2` @@ -101,7 +103,7 @@ abstract class Configuration extends DataFlow::Configuration { predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() } final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) { - isAdditionalTaintStep(node1, node2) or + this.isAdditionalTaintStep(node1, node2) or defaultAdditionalTaintStep(node1, node2) }