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

C++: autoformat

Browse Source
This commit is contained in:
Robert Marsh
2019-12-09 13:47:38 -08:00
parent b9f8c39fe2
commit 18e7eff43c
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cpp/ql/src/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
View File

@@ -30,9 +30,7 @@ private class DefaultTaintTrackingCfg extends DataFlow::Configuration {
instructionTaintStep(n1.asInstruction(), n2.asInstruction())
}
override predicate isBarrier(DataFlow::Node node) {
nodeIsBarrier(node)
}
override predicate isBarrier(DataFlow::Node node) { nodeIsBarrier(node) }
}
private class ToGlobalVarTaintTrackingCfg extends DataFlow::Configuration {
@@ -41,9 +39,7 @@ private class ToGlobalVarTaintTrackingCfg extends DataFlow::Configuration {
override predicate isSource(DataFlow::Node source) { isUserInput(source.asExpr(), _) }
override predicate isSink(DataFlow::Node sink) {
exists(GlobalOrNamespaceVariable gv |
writesVariable(sink.asInstruction(), gv)
)
exists(GlobalOrNamespaceVariable gv | writesVariable(sink.asInstruction(), gv))
}
override predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
@@ -57,16 +53,16 @@ private class ToGlobalVarTaintTrackingCfg extends DataFlow::Configuration {
)
}
override predicate isBarrier(DataFlow::Node node) {
nodeIsBarrier(node)
}
override predicate isBarrier(DataFlow::Node node) { nodeIsBarrier(node) }
}
private class FromGlobalVarTaintTrackingCfg extends DataFlow2::Configuration {
FromGlobalVarTaintTrackingCfg() { this = "FromGlobalVarTaintTrackingCfg" }
override predicate isSource(DataFlow::Node source) {
exists(ToGlobalVarTaintTrackingCfg other, DataFlow::Node prevSink, GlobalOrNamespaceVariable gv |
exists(
ToGlobalVarTaintTrackingCfg other, DataFlow::Node prevSink, GlobalOrNamespaceVariable gv
|
other.hasFlowTo(prevSink) and
writesVariable(prevSink.asInstruction(), gv) and
readsVariable(source.asInstruction(), gv)
@@ -79,9 +75,7 @@ private class FromGlobalVarTaintTrackingCfg extends DataFlow2::Configuration {
instructionTaintStep(n1.asInstruction(), n2.asInstruction())
}
override predicate isBarrier(DataFlow::Node node) {
nodeIsBarrier(node)
}
override predicate isBarrier(DataFlow::Node node) { nodeIsBarrier(node) }
}
private predicate readsVariable(LoadInstruction load, Variable var) {
@@ -110,10 +104,10 @@ private predicate hasUpperBoundsCheck(Variable var) {
}
private predicate nodeIsBarrier(DataFlow::Node node) {
exists(Variable checkedVar |
readsVariable(node.asInstruction(), checkedVar) and
hasUpperBoundsCheck(checkedVar)
)
exists(Variable checkedVar |
readsVariable(node.asInstruction(), checkedVar) and
hasUpperBoundsCheck(checkedVar)
)
}
private predicate instructionTaintStep(Instruction i1, Instruction i2) {
@@ -201,17 +195,25 @@ predicate taintedIncludingGlobalVars(Expr source, Element tainted, string global
GlobalOrNamespaceVariable global, DataFlow::Node load, DataFlow::Node sink
|
toCfg.hasFlow(DataFlow::exprNode(source), store) and
store.asInstruction().(StoreInstruction).getDestinationAddress().(VariableAddressInstruction).getASTVariable() = global and
load.asInstruction().(LoadInstruction).getSourceAddress().(VariableAddressInstruction).getASTVariable() = global and
store
.asInstruction()
.(StoreInstruction)
.getDestinationAddress()
.(VariableAddressInstruction)
.getASTVariable() = global and
load
.asInstruction()
.(LoadInstruction)
.getSourceAddress()
.(VariableAddressInstruction)
.getASTVariable() = global and
fromCfg.hasFlow(load, sink) and
tainted = adjustedSink(sink) and
global = globalVarFromId(globalVar)
)
}
GlobalOrNamespaceVariable globalVarFromId(string id) {
id = result.getQualifiedName()
}
GlobalOrNamespaceVariable globalVarFromId(string id) { id = result.getQualifiedName() }
Function resolveCall(Call call) {
exists(CallInstruction callInstruction |