Skip to content

Commit 8092345

Browse files
committed
PS: Make type-tracking and taint-tracking compile again.
1 parent 8f9bc1e commit 8092345

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

powershell/ql/lib/semmle/code/powershell/dataflow/internal/TaintTrackingPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private module Cached {
4141
)
4242
or
4343
// Flow through string interpolation
44-
exists(CfgNodes::ExprNodes::ExpandableStringCfgNode es |
44+
exists(CfgNodes::ExprNodes::ExpandableStringExprCfgNode es |
4545
nodeFrom.asExpr() = es.getAnExpr() and
4646
nodeTo.asExpr() = es
4747
)

powershell/ql/lib/semmle/code/powershell/typetracking/internal/TypeTrackingImpl.qll

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ private import codeql.util.Unit
1515

1616
pragma[noinline]
1717
private predicate sourceArgumentPositionMatch(
18-
CallCfgNode call, DataFlowPrivate::ArgumentNode arg, DataFlowDispatch::ParameterPosition ppos
18+
ExprNodes::CallExprCfgNode call, DataFlowPrivate::ArgumentNode arg,
19+
DataFlowDispatch::ParameterPosition ppos
1920
) {
2021
exists(DataFlowDispatch::ArgumentPosition apos |
2122
arg.sourceArgumentOf(call, apos) and
@@ -213,7 +214,7 @@ module TypeTrackingInput implements Shared::TypeTrackingInput<Location> {
213214
* Holds if `nodeFrom` steps to `nodeTo` by being returned from a call.
214215
*/
215216
predicate returnStep(Node nodeFrom, LocalSourceNode nodeTo) {
216-
exists(CallCfgNode call |
217+
exists(ExprNodes::CallExprCfgNode call |
217218
nodeFrom instanceof DataFlowPrivate::ReturnNode and
218219
nodeFrom.(DataFlowPrivate::NodeImpl).getCfgScope() =
219220
DataFlowDispatch::getTarget(DataFlowDispatch::TNormalCall(call)) and

0 commit comments

Comments
 (0)