Python: Minor refactoring

RasmusWL · RasmusWL · commit 238e0845aa0c · 2020-08-25T12:50:41.000+02:00
diff --git a/python/ql/src/experimental/dataflow/internal/TaintTrackingPrivate.qll b/python/ql/src/experimental/dataflow/internal/TaintTrackingPrivate.qll
@@ -41,12 +41,7 @@ predicate localAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeT
  */
 predicate concatStep(DataFlow::CfgNode nodeFrom, DataFlow::CfgNode nodeTo) {
   exists(BinaryExprNode add | add = nodeTo.getNode() |
-    add.getOp() instanceof Add and
-    (
-      add.getLeft() = nodeFrom.getNode()
-      or
-      add.getRight() = nodeFrom.getNode()
-    )
+    add.getOp() instanceof Add and add.getAnOperand() = nodeFrom.getNode()
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,7 @@ predicate localAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeT`
`41`	`41`	`*/`
`42`	`42`	`predicate concatStep(DataFlow::CfgNode nodeFrom, DataFlow::CfgNode nodeTo) {`
`43`	`43`	`exists(BinaryExprNode add \| add = nodeTo.getNode() \|`
`44`		`- add.getOp() instanceof Add and`
`45`		`- (`
`46`		`- add.getLeft() = nodeFrom.getNode()`
`47`		`- or`
`48`		`- add.getRight() = nodeFrom.getNode()`
`49`		`- )`
	`44`	`+ add.getOp() instanceof Add and add.getAnOperand() = nodeFrom.getNode()`
`50`	`45`	`)`
`51`	`46`	`}`
`52`	`47`