From 763861bef9cf6cc212ef8b13283b65192ee1ff98 Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan Date: Thu, 6 May 2021 14:54:59 +0100 Subject: [PATCH] Keep call to defaultTaintSanitizerGuard --- .../go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll | 4 +++- .../go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll index f4f73b8247c..1607704093d 100644 --- a/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll +++ b/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll @@ -92,7 +92,9 @@ abstract class Configuration extends DataFlow::Configuration { /** 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) { + isSanitizerGuard(guard) or defaultTaintSanitizerGuard(guard) + } /** * Holds if the additional taint propagation step from `node1` to `node2` diff --git a/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll index f4f73b8247c..1607704093d 100644 --- a/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll +++ b/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll @@ -92,7 +92,9 @@ abstract class Configuration extends DataFlow::Configuration { /** 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) { + isSanitizerGuard(guard) or defaultTaintSanitizerGuard(guard) + } /** * Holds if the additional taint propagation step from `node1` to `node2`