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

Data flow: Move toNormalSinkNodeEx into PathNodeMid

Browse Source
This commit is contained in:
Tom Hvitved
2024-08-27 14:48:57 +02:00
parent 287857c5db
commit 80b6135a64
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,16 +246,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
ReturnKindExt getKind() { result = pos.getKind() } ReturnKindExt getKind() { result = pos.getKind() }
} }
/** If `node` corresponds to a sink, gets the normal node for that sink. */
pragma[nomagic]
private NodeEx toNormalSinkNodeEx(NodeEx node) {
exists(Node n |
node.asNodeOrImplicitRead() = n and
(Config::isSink(n) or Config::isSink(n, _)) and
result.asNode() = n
)
}
private predicate inBarrier(NodeEx node) { private predicate inBarrier(NodeEx node) {
exists(Node n | exists(Node n |
node.asNode() = n and node.asNode() = n and
@@ -2607,7 +2597,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
TPathNodeSink(NodeEx node, FlowState state) { TPathNodeSink(NodeEx node, FlowState state) {
exists(PathNodeMid sink | exists(PathNodeMid sink |
sink.isAtSink() and sink.isAtSink() and
node = toNormalSinkNodeEx(sink.getNodeEx()) and node = sink.toNormalSinkNodeEx() and
state = sink.getState() state = sink.getState()
) )
} or } or
@@ -2734,6 +2724,16 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
) )
} }
/** If this node corresponds to a sink, gets the normal node for that sink. */
pragma[nomagic]
NodeEx toNormalSinkNodeEx() {
exists(Node n |
node.asNodeOrImplicitRead() = n and
(Config::isSink(n) or Config::isSink(n, _)) and
result.asNode() = n
)
}
override PathNodeImpl getASuccessorImpl(string label) { override PathNodeImpl getASuccessorImpl(string label) {
// an intermediate step to another intermediate node // an intermediate step to another intermediate node
exists(string l2 | result = this.getSuccMid(l2) | exists(string l2 | result = this.getSuccMid(l2) |
@@ -2825,7 +2825,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
PathNodeSink projectToSink(string model) { PathNodeSink projectToSink(string model) {
this.isAtSink() and this.isAtSink() and
sinkModel(node, model) and sinkModel(node, model) and
result.getNodeEx() = toNormalSinkNodeEx(node) and result.getNodeEx() = this.toNormalSinkNodeEx() and
result.getState() = state result.getState() = state
} }
} }