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

JavaScript: Simplify onPath predicate.

Browse Source
This commit is contained in:
Max Schaefer
2018-09-03 15:56:46 +01:00
parent 8d471f01ef
commit dad13c9b64
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -669,21 +669,18 @@ private predicate reachableFromSource(DataFlow::Node nd, DataFlow::Configuration
/**
* Holds if `nd` can be reached from a source under `cfg`, and in turn a sink is
* reachable from `nd`. The path from the source to `nd` is summarized by `summary1`,
* the path from `nd` to the sink is summarized by `summary2`.
* reachable from `nd`, where the path from the source to `nd` is summarized by `summary`.
*/
private predicate onPath(DataFlow::Node nd, DataFlow::Configuration cfg,
PathSummary summary1, PathSummary summary2) {
reachableFromSource(nd, cfg, summary1) and
isSink(nd, cfg, summary1.getEndLabel()) and
not cfg.isBarrier(nd) and
summary2 = PathSummary::level()
PathSummary summary) {
reachableFromSource(nd, cfg, summary) and
isSink(nd, cfg, summary.getEndLabel()) and
not cfg.isBarrier(nd)
or
exists (DataFlow::Node mid, PathSummary newSummary, PathSummary oldSummary |
onPath(mid, cfg, _, oldSummary) and
flowStep(nd, cfg, mid, newSummary) and
reachableFromSource(nd, cfg, summary1) and
summary2 = oldSummary.prepend(newSummary)
exists (DataFlow::Node mid, PathSummary stepSummary |
reachableFromSource(nd, cfg, summary) and
flowStep(nd, cfg, mid, stepSummary) and
onPath(mid, cfg, summary.append(stepSummary))
)
}
@@ -692,7 +689,7 @@ private predicate onPath(DataFlow::Node nd, DataFlow::Configuration cfg,
*/
private newtype TPathNode =
MkPathNode(DataFlow::Node nd, DataFlow::Configuration cfg, PathSummary summary) {
onPath(nd, cfg, summary, _)
onPath(nd, cfg, summary)
}
/**