Python: Address review

yoff · yoff · commit 0eb8b6c7b0fe · 2020-09-11T14:24:49.000+02:00
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
@@ -176,8 +176,10 @@ class BarrierGuard extends GuardNode {
 
   /** Gets a node guarded by this guard. */
   final ExprNode getAGuardedNode() {
-    exists(boolean testIsTrue |
-      this.checks(result.asCfgNode(), testIsTrue) and
+    exists(Variable v, NameNode n, boolean testIsTrue |
+      n.uses(v) and
+      this.checks(n, testIsTrue) and
+      result.asCfgNode().(NameNode).uses(v) and
       this.controlsNode(result.asCfgNode(), testIsTrue)
     )
   }
diff --git a/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql b/python/ql/test/experimental/dataflow/tainttracking/customSanitizer/TestTaint.ql
@@ -1,15 +1,10 @@
 import experimental.dataflow.tainttracking.TestTaintLib
 
 class IsSafeCheck extends DataFlow::BarrierGuard {
-  Variable v;
-
-  IsSafeCheck() {
-    this.(CallNode).getNode().getFunc().(Name).getId() = "emulated_is_safe" and
-    this.(CallNode).getAnArg().(NameNode).uses(v)
-  }
+  IsSafeCheck() { this.(CallNode).getNode().getFunc().(Name).getId() = "emulated_is_safe" }
 
   override predicate checks(ControlFlowNode node, boolean testIsTrue) {
-    node.(NameNode).uses(v) and
+    node = this.(CallNode).getAnArg() and
     testIsTrue = true
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,10 @@ class BarrierGuard extends GuardNode {`
`176`	`176`
`177`	`177`	`/** Gets a node guarded by this guard. */`
`178`	`178`	`final ExprNode getAGuardedNode() {`
`179`		`- exists(boolean testIsTrue \|`
`180`		`- this.checks(result.asCfgNode(), testIsTrue) and`
	`179`	`+ exists(Variable v, NameNode n, boolean testIsTrue \|`
	`180`	`+ n.uses(v) and`
	`181`	`+ this.checks(n, testIsTrue) and`
	`182`	`+ result.asCfgNode().(NameNode).uses(v) and`
`181`	`183`	`this.controlsNode(result.asCfgNode(), testIsTrue)`
`182`	`184`	`)`
`183`	`185`	`}`