hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

change join order for summarizedHigherOrderCall

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2021-02-22 17:49:58 +01:00
parent b3aa358177
commit 56405f40b0
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
javascript/ql/src/semmle/javascript/dataflow/Configuration.qll
View File

@@ -1296,12 +1296,9 @@ private predicate summarizedHigherOrderCall(
Function f, DataFlow::InvokeNode outer, DataFlow::InvokeNode inner, int j,
DataFlow::Node innerArg, DataFlow::SourceNode cbParm, PathSummary oldSummary
|
reachableFromInput(f, outer, arg, innerArg, cfg, oldSummary) and
// Only track actual parameter flow.
// Captured flow does not need to be summarized - it is handled by the local case in `higherOrderCall`.
not arg = DataFlow::capturedVariableNode(_) and
argumentPassing(outer, cb, f, cbParm) and
innerArg = inner.getArgument(j)
summarizedHigherOrderCallAux(f, outer, arg, innerArg, cfg, oldSummary, cbParm, inner, j, cb)
|
// direct higher-order call
cbParm.flowsTo(inner.getCalleeNode()) and
@@ -1317,6 +1314,21 @@ private predicate summarizedHigherOrderCall(
)
}
/**
* @see `summarizedHigherOrderCall`.
*/
pragma[noinline]
private predicate summarizedHigherOrderCallAux(
Function f, DataFlow::InvokeNode outer, DataFlow::Node arg, DataFlow::Node innerArg,
DataFlow::Configuration cfg, PathSummary oldSummary, DataFlow::SourceNode cbParm,
DataFlow::InvokeNode inner, int j, DataFlow::Node cb
) {
reachableFromInput(f, outer, arg, innerArg, cfg, oldSummary) and
// Only track actual parameter flow.
argumentPassing(outer, cb, f, cbParm) and
innerArg = inner.getArgument(j)
}
/**
* Holds if `arg` is passed as the `i`th argument to `callback` through a callback invocation.
*