C++: Fix compilation issue in UseAfterFree.qll.

geoffw0 · geoffw0 · commit 8d3fc735ea8f · 2024-03-13T17:03:00.000Z
diff --git a/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/UseAfterFree.qll b/cpp/ql/lib/semmle/code/cpp/security/flowafterfree/UseAfterFree.qll
@@ -139,6 +139,7 @@ private module ParameterSinks {
 }
 
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
 
 /**
  * Holds if `n` represents the expression `e`, and `e` is a pointer that is
@@ -149,11 +150,11 @@ private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon
 predicate isUse(DataFlow::Node n, Expr e) {
   isUse0(e) and n.asExpr() = e
   or
-  exists(CallInstruction call, InitializeParameterInstruction init |
+  exists(DataFlowCall call, InitializeParameterInstruction init |
     n.asOperand().getDef().getUnconvertedResultExpression() = e and
     pragma[only_bind_into](init) = ParameterSinks::getAnAlwaysDereferencedParameter() and
     viableParamArg(call, DataFlow::instructionNode(init), n) and
     pragma[only_bind_out](init.getEnclosingFunction()) =
-      pragma[only_bind_out](call.getStaticCallTarget())
+      pragma[only_bind_out](call.asCallInstruction().getStaticCallTarget())
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ private module ParameterSinks {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon`
	`142`	`+private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate`
`142`	`143`
`143`	`144`	`/**`
`144`	`145`	* Holds if `n` represents the expression `e`, and `e` is a pointer that is
`@@ -149,11 +150,11 @@ private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon`
`149`	`150`	`predicate isUse(DataFlow::Node n, Expr e) {`
`150`	`151`	`isUse0(e) and n.asExpr() = e`
`151`	`152`	`or`
`152`		`- exists(CallInstruction call, InitializeParameterInstruction init \|`
	`153`	`+ exists(DataFlowCall call, InitializeParameterInstruction init \|`
`153`	`154`	`n.asOperand().getDef().getUnconvertedResultExpression() = e and`
`154`	`155`	`pragma[only_bind_into](init) = ParameterSinks::getAnAlwaysDereferencedParameter() and`
`155`	`156`	`viableParamArg(call, DataFlow::instructionNode(init), n) and`
`156`	`157`	`pragma[only_bind_out](init.getEnclosingFunction()) =`
`157`		`- pragma[only_bind_out](call.getStaticCallTarget())`
	`158`	`+ pragma[only_bind_out](call.asCallInstruction().getStaticCallTarget())`
`158`	`159`	`)`
`159`	`160`	`}`