Skip to content

Commit 26e8701

Browse files
committed
C++: Fix a few qualifiers.
1 parent cdb4158 commit 26e8701

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ predicate modeledTaintStep(DataFlow::Node nodeIn, DataFlow::Node nodeOut, string
208208
// Taint flow from a pointer argument to an output, when the model specifies flow from the deref
209209
// to that output, but the deref is not modeled in the IR for the caller.
210210
exists(
211-
CallInstruction call, DataFlow::SideEffectOperandNode indirectArgument, Function func,
211+
CallInstruction call, SideEffectOperandNode indirectArgument, Function func,
212212
FunctionInput modelIn, FunctionOutput modelOut
213213
|
214214
indirectArgument = callInput(call, modelIn) and

cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ private Expr getExpr(DataFlow::Node node) {
4646
or
4747
result = node.asOperand().getUse().getAst()
4848
or
49-
result = node.(DataFlow::RawIndirectInstruction).getInstruction().getAst()
49+
result = node.(RawIndirectInstruction).getInstruction().getAst()
5050
or
51-
result = node.(DataFlow::RawIndirectOperand).getOperand().getUse().getAst()
51+
result = node.(RawIndirectOperand).getOperand().getUse().getAst()
5252
}
5353

5454
/**
@@ -209,7 +209,7 @@ class LoopWithAlloca extends Stmt {
209209
this.conditionRequiresInequality(va, _, _) and
210210
DataFlow::localFlow(result, DataFlow::exprNode(va)) and
211211
// Phi nodes will be preceded by nodes that represent actual definitions
212-
not result instanceof DataFlow::SsaSynthNode and
212+
not result instanceof SsaSynthNode and
213213
// A source is outside the loop if it's not inside the loop
214214
not exists(Expr e | e = getExpr(result) | this = getAnEnclosingLoopOfExpr(e))
215215
)

cpp/ql/src/utils/modelgenerator/internal/CaptureModels.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ private module SinkModelGeneratorInput implements SinkModelGeneratorInputSig {
404404
}
405405

406406
predicate apiSource(DataFlow::Node source) {
407-
DataFlowPrivate::nodeHasOperand(source, any(DataFlow::FieldAddress fa), 1)
407+
DataFlowPrivate::nodeHasOperand(source, any(DataFlowNodes::FieldAddress fa), 1)
408408
or
409409
source instanceof DataFlow::ParameterNode
410410
}
@@ -417,7 +417,7 @@ private module SinkModelGeneratorInput implements SinkModelGeneratorInputSig {
417417
result = "Argument[" + DataFlow::repeatStars(indirectionIndex) + argumentIndex + "]"
418418
)
419419
or
420-
DataFlowPrivate::nodeHasOperand(source, any(DataFlow::FieldAddress fa), 1) and
420+
DataFlowPrivate::nodeHasOperand(source, any(DataFlowNodes::FieldAddress fa), 1) and
421421
result = qualifierString()
422422
}
423423

0 commit comments

Comments
 (0)