PS: Make type-tracking and taint-tracking compile again.

This commit is contained in:
Mathias Vorreiter Pedersen
2025-03-25 17:13:03 +00:00
parent 8f9bc1e4b2
commit 8092345fee
2 changed files with 4 additions and 3 deletions

View File

@@ -41,7 +41,7 @@ private module Cached {
)
or
// Flow through string interpolation
exists(CfgNodes::ExprNodes::ExpandableStringCfgNode es |
exists(CfgNodes::ExprNodes::ExpandableStringExprCfgNode es |
nodeFrom.asExpr() = es.getAnExpr() and
nodeTo.asExpr() = es
)

View File

@@ -15,7 +15,8 @@ private import codeql.util.Unit
pragma[noinline]
private predicate sourceArgumentPositionMatch(
CallCfgNode call, DataFlowPrivate::ArgumentNode arg, DataFlowDispatch::ParameterPosition ppos
ExprNodes::CallExprCfgNode call, DataFlowPrivate::ArgumentNode arg,
DataFlowDispatch::ParameterPosition ppos
) {
exists(DataFlowDispatch::ArgumentPosition apos |
arg.sourceArgumentOf(call, apos) and
@@ -213,7 +214,7 @@ module TypeTrackingInput implements Shared::TypeTrackingInput<Location> {
* Holds if `nodeFrom` steps to `nodeTo` by being returned from a call.
*/
predicate returnStep(Node nodeFrom, LocalSourceNode nodeTo) {
exists(CallCfgNode call |
exists(ExprNodes::CallExprCfgNode call |
nodeFrom instanceof DataFlowPrivate::ReturnNode and
nodeFrom.(DataFlowPrivate::NodeImpl).getCfgScope() =
DataFlowDispatch::getTarget(DataFlowDispatch::TNormalCall(call)) and