hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16313 from hvitved/dataflow/fix-bad-join3

Browse Source 
Data flow: Fix bad join
This commit is contained in:
Tom Hvitved
2024-04-24 17:09:14 +02:00
committed by GitHub
parent f29d2c21bd 95d579d9de
commit 17e0cc5648
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
View File

@@ -1142,6 +1142,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
) )
} }
pragma[nomagic]
private predicate returnCallEdgeInCtx1(
DataFlowCallable c, SndLevelScopeOption scope, DataFlowCall call, NodeEx out, DataFlowCall ctx
) {
returnCallEdge1(c, scope, call, out) and
c = viableImplInCallContextExt(call, ctx)
}
private int ctxDispatchFanoutOnReturn(NodeEx out, DataFlowCall ctx) { private int ctxDispatchFanoutOnReturn(NodeEx out, DataFlowCall ctx) {
exists(DataFlowCall call, DataFlowCallable c | exists(DataFlowCall call, DataFlowCallable c |
simpleDispatchFanoutOnReturn(call, out) > 1 and simpleDispatchFanoutOnReturn(call, out) > 1 and
@@ -1151,8 +1159,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
mayBenefitFromCallContextExt(call, _) and mayBenefitFromCallContextExt(call, _) and
result = result =
count(DataFlowCallable tgt, SndLevelScopeOption scope | count(DataFlowCallable tgt, SndLevelScopeOption scope |
tgt = viableImplInCallContextExt(call, ctx) and returnCallEdgeInCtx1(tgt, scope, call, out, ctx)
returnCallEdge1(tgt, scope, call, out)
) )
) )
} }