Skip to content

Commit 18acad5

Browse files
authored
Merge pull request github#16251 from hvitved/dataflow/fix-bad-join2
Data flow: Fix a bad join
2 parents a108fcd + 339c40c commit 18acad5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4469,6 +4469,12 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
44694469
)
44704470
}
44714471

4472+
bindingset[par, ret]
4473+
pragma[inline_late]
4474+
private predicate summaryCtxStepStar(PathNodeImpl par, PathNodeImpl ret) {
4475+
summaryCtxStep*(par) = ret
4476+
}
4477+
44724478
/**
44734479
* Holds if `(arg, par, ret, out)` forms a subpath-tuple.
44744480
*
@@ -4483,7 +4489,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
44834489
any(PathNodeImpl n | localStepToHidden*(ret, n)), out) and
44844490
not par.isHidden() and
44854491
not ret.isHidden() and
4486-
ret = summaryCtxStep*(par)
4492+
summaryCtxStepStar(par, ret)
44874493
or
44884494
// wrapped subpath using hidden nodes, e.g. flow through a callback inside
44894495
// a summarized callable

0 commit comments

Comments
 (0)