C++: Fix ql-for-ql alerts.

MathiasVP · MathiasVP · commit d62ae9676369 · 2022-10-14T10:14:53.000+02:00
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -887,7 +887,7 @@ class ThisParameterNode extends ParameterNode, InstructionNode {
 }
 
 pragma[noinline]
-private predicate indirectPostionHasArgumentIndexAndIndex(
+private predicate indirectPositionHasArgumentIndexAndIndex(
   IndirectionPosition pos, int argumentIndex, int indirectionIndex
 ) {
   pos.getArgumentIndex() = argumentIndex and
@@ -907,7 +907,7 @@ class ParameterIndirectionNode extends ParameterNode instanceof IndirectParamete
   override predicate isParameterOf(Function f, ParameterPosition pos) {
     IndirectParameterNode.super.getEnclosingCallable() = f and
     exists(int argumentIndex, int indirectionIndex |
-      indirectPostionHasArgumentIndexAndIndex(pos, argumentIndex, indirectionIndex) and
+      indirectPositionHasArgumentIndexAndIndex(pos, argumentIndex, indirectionIndex) and
       indirectParameterNodeHasArgumentIndexAndIndex(this, argumentIndex, indirectionIndex)
     )
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -5,7 +5,6 @@ private import semmle.code.cpp.models.interfaces.DataFlow
 private import semmle.code.cpp.models.interfaces.SideEffect
 private import DataFlowUtil
 private import DataFlowPrivate
-private import semmle.code.cpp.models.Models
 
 /**
  * Holds if taint propagates from `nodeFrom` to `nodeTo` in exactly one local
@@ -133,7 +132,7 @@ predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::Content c) { n
 predicate defaultTaintSanitizer(DataFlow::Node node) { none() }
 
 /**
- * Holds if taint can flow from `instrIn` to `instrOut` through a call to a
+ * Holds if taint can flow from `nodeIn` to `nodeOut` through a call to a
  * modeled function.
  */
 predicate modeledTaintStep(DataFlow::Node nodeIn, DataFlow::Node nodeOut) {

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ class ThisParameterNode extends ParameterNode, InstructionNode {`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`pragma[noinline]`
`890`		`-private predicate indirectPostionHasArgumentIndexAndIndex(`
	`890`	`+private predicate indirectPositionHasArgumentIndexAndIndex(`
`891`	`891`	`IndirectionPosition pos, int argumentIndex, int indirectionIndex`
`892`	`892`	`) {`
`893`	`893`	`pos.getArgumentIndex() = argumentIndex and`
`@@ -907,7 +907,7 @@ class ParameterIndirectionNode extends ParameterNode instanceof IndirectParamete`
`907`	`907`	`override predicate isParameterOf(Function f, ParameterPosition pos) {`
`908`	`908`	`IndirectParameterNode.super.getEnclosingCallable() = f and`
`909`	`909`	`exists(int argumentIndex, int indirectionIndex \|`
`910`		`- indirectPostionHasArgumentIndexAndIndex(pos, argumentIndex, indirectionIndex) and`
	`910`	`+ indirectPositionHasArgumentIndexAndIndex(pos, argumentIndex, indirectionIndex) and`
`911`	`911`	`indirectParameterNodeHasArgumentIndexAndIndex(this, argumentIndex, indirectionIndex)`
`912`	`912`	`)`
`913`	`913`	`}`