Skip to content

Data flow: fix bad join in localFlowExit #17339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
asgerf wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Data flow: fix bad join in localFlowExit #17339

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5348b03
Data flow: Duplicate call to 'revFlow'
asgerf Aug 29, 2024
5a47dd1
Data flow: remove unused 'apNext'
asgerf Aug 29, 2024
60faa00
Data flow: unify apNext with ap as they're always equal in this clause
asgerf Aug 29, 2024
f3a6561
Data flow: add only_bind_out to 'next'
asgerf Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2695,20 +2695,22 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
private predicate localFlowExit(NodeEx node, FlowState state, Ap ap) {
revFlow(node, pragma[only_bind_into](state), pragma[only_bind_into](ap)) and
(
exists(NodeEx next, Ap apNext | revFlow(next, pragma[only_bind_into](state), apNext) |
jumpStepEx(node, next) and
apNext = ap
exists(NodeEx next |
revFlow(pragma[only_bind_out](next), pragma[only_bind_into](state), ap)
|
jumpStepEx(node, next)
or
additionalJumpStep(node, next, _) and
apNext = ap and
ap instanceof ApNil
or
callEdgeArgParam(_, _, node, next, _, ap) and
apNext = ap
or
callEdgeReturn(_, _, node, _, next, _, ap) and
apNext = ap
callEdgeArgParam(_, _, node, next, _, ap)
or
callEdgeReturn(_, _, node, _, next, _, ap)
)
or
exists(NodeEx next |
revFlow(pragma[only_bind_out](next), pragma[only_bind_into](state), _)
|
storeStepCand(node, _, _, next, _, _)
or
readStepCand(node, _, next)
Expand Down