C++: Add a missing taint step and accept test changes.

MathiasVP · MathiasVP · commit 401717d739c3 · 2024-04-29T09:38:42.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Iterator.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Iterator.qll
@@ -560,7 +560,7 @@ private class IteratorAssignmentMemberOperatorModel extends IteratorAssignmentMe
   TaintFunction, SideEffectFunction, AliasFunction
 {
   override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    input.isParameterDeref(0) and
+    (input.isParameterDeref(0) or input.isParameter(0)) and
     output.isQualifierObject()
   }
 
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
@@ -4,5 +4,4 @@ WARNING: Module DataFlow has been deprecated and may be removed in future (taint
 WARNING: Module DataFlow has been deprecated and may be removed in future (taint.ql:68,25-33)
 WARNING: Module TaintTracking has been deprecated and may be removed in future (taint.ql:73,20-33)
 testFailures
-| standalone_iterators.cpp:112:11:112:21 | // $ ast,ir | Missing result:ir= |
 failures

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ private class IteratorAssignmentMemberOperatorModel extends IteratorAssignmentMe`
`560`	`560`	`TaintFunction, SideEffectFunction, AliasFunction`
`561`	`561`	`{`
`562`	`562`	`override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {`
`563`		`- input.isParameterDeref(0) and`
	`563`	`+ (input.isParameterDeref(0) or input.isParameter(0)) and`
`564`	`564`	`output.isQualifierObject()`
`565`	`565`	`}`
`566`	`566`