PS: Avoid CP.

MathiasVP · MathiasVP · commit 7fe9cce53f76 · 2024-11-11T12:19:46.000Z
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
@@ -842,6 +842,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
     c.isAnyElement()
   )
   or
+  c.isAnyElement() and
   exists(
     CfgNodes::ExprNodes::ArrayExprCfgNode arrayExpr, EscapeContainer::EscapeContainer container
   |
@@ -857,9 +858,9 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
     node2.(ReturnNodeImpl).getCfgScope() = cfgNode.getScope()
   )
   or
+  c.isAnyElement() and
   exists(CfgNode cfgNode |
     node1 = TImplicitWrapNode(cfgNode, true) and
-    c.isAnyElement() and
     node2.(ReturnNodeImpl).getCfgScope() = cfgNode.getScope()
   )
   or

Original file line number	Diff line number	Diff line change
`@@ -842,6 +842,7 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {`
`842`	`842`	`c.isAnyElement()`
`843`	`843`	`)`
`844`	`844`	`or`
	`845`	`+ c.isAnyElement() and`
`845`	`846`	`exists(`
`846`	`847`	`CfgNodes::ExprNodes::ArrayExprCfgNode arrayExpr, EscapeContainer::EscapeContainer container`
`847`	`848`	`\|`
`@@ -857,9 +858,9 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {`
`857`	`858`	`node2.(ReturnNodeImpl).getCfgScope() = cfgNode.getScope()`
`858`	`859`	`)`
`859`	`860`	`or`
	`861`	`+ c.isAnyElement() and`
`860`	`862`	`exists(CfgNode cfgNode \|`
`861`	`863`	`node1 = TImplicitWrapNode(cfgNode, true) and`
`862`		`- c.isAnyElement() and`
`863`	`864`	`node2.(ReturnNodeImpl).getCfgScope() = cfgNode.getScope()`
`864`	`865`	`)`
`865`	`866`	`or`