C++: test for interprocedurl iterator flow

Robert Marsh · Robert Marsh · commit 2e187a51ae6d · 2020-09-09T12:45:06.000-07:00
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -3269,22 +3269,16 @@
 | vector.cpp:350:38:350:39 | v4 | vector.cpp:350:41:350:45 | call to begin | TAINT |
 | vector.cpp:350:41:350:45 | call to begin | vector.cpp:350:50:350:51 | it |  |
 | vector.cpp:350:41:350:45 | call to begin | vector.cpp:350:68:350:69 | it |  |
-| vector.cpp:350:41:350:45 | call to begin | vector.cpp:351:4:351:5 | it |  |
+| vector.cpp:350:41:350:45 | call to begin | vector.cpp:351:32:351:33 | it |  |
 | vector.cpp:350:56:350:57 | ref arg v4 | vector.cpp:350:56:350:57 | v4 |  |
 | vector.cpp:350:56:350:57 | ref arg v4 | vector.cpp:353:7:353:8 | v4 |  |
 | vector.cpp:350:56:350:57 | ref arg v4 | vector.cpp:382:1:382:1 | v4 |  |
 | vector.cpp:350:56:350:57 | v4 | vector.cpp:350:59:350:61 | call to end | TAINT |
 | vector.cpp:350:68:350:69 | it | vector.cpp:350:66:350:66 | call to operator++ | TAINT |
 | vector.cpp:350:68:350:69 | ref arg it | vector.cpp:350:50:350:51 | it |  |
 | vector.cpp:350:68:350:69 | ref arg it | vector.cpp:350:68:350:69 | it |  |
-| vector.cpp:350:68:350:69 | ref arg it | vector.cpp:351:4:351:5 | it |  |
-| vector.cpp:351:3:351:3 | call to operator* [post update] | vector.cpp:350:56:350:57 | v4 |  |
-| vector.cpp:351:3:351:3 | call to operator* [post update] | vector.cpp:353:7:353:8 | v4 |  |
-| vector.cpp:351:3:351:3 | call to operator* [post update] | vector.cpp:382:1:382:1 | v4 |  |
-| vector.cpp:351:3:351:16 | ... = ... | vector.cpp:351:3:351:3 | call to operator* [post update] |  |
-| vector.cpp:351:4:351:5 | it | vector.cpp:351:3:351:3 | call to operator* | TAINT |
-| vector.cpp:351:9:351:14 | call to source | vector.cpp:351:3:351:3 | call to operator* [post update] | TAINT |
-| vector.cpp:351:9:351:14 | call to source | vector.cpp:351:3:351:16 | ... = ... |  |
+| vector.cpp:350:68:350:69 | ref arg it | vector.cpp:351:32:351:33 | it |  |
+| vector.cpp:351:32:351:33 | it | vector.cpp:351:32:351:33 | call to iterator |  |
 | vector.cpp:353:7:353:8 | ref arg v4 | vector.cpp:382:1:382:1 | v4 |  |
 | vector.cpp:355:34:355:35 | ref arg v5 | vector.cpp:357:7:357:8 | v5 |  |
 | vector.cpp:355:34:355:35 | ref arg v5 | vector.cpp:359:7:359:8 | v5 |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
@@ -328,7 +328,6 @@
 | vector.cpp:326:7:326:8 | v4 | vector.cpp:318:15:318:20 | call to source |
 | vector.cpp:338:7:338:8 | v1 | vector.cpp:337:8:337:13 | call to source |
 | vector.cpp:343:7:343:8 | v2 | vector.cpp:341:9:341:14 | call to source |
-| vector.cpp:353:7:353:8 | v4 | vector.cpp:351:9:351:14 | call to source |
 | vector.cpp:357:7:357:8 | v5 | vector.cpp:356:8:356:13 | call to source |
 | vector.cpp:359:7:359:8 | v5 | vector.cpp:356:8:356:13 | call to source |
 | vector.cpp:363:7:363:8 | v6 | vector.cpp:362:8:362:13 | call to source |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected
@@ -277,7 +277,6 @@
 | vector.cpp:326:7:326:8 | vector.cpp:318:15:318:20 | AST only |
 | vector.cpp:338:7:338:8 | vector.cpp:337:8:337:13 | AST only |
 | vector.cpp:343:7:343:8 | vector.cpp:341:9:341:14 | AST only |
-| vector.cpp:353:7:353:8 | vector.cpp:351:9:351:14 | AST only |
 | vector.cpp:357:7:357:8 | vector.cpp:356:8:356:13 | AST only |
 | vector.cpp:359:7:359:8 | vector.cpp:356:8:356:13 | AST only |
 | vector.cpp:363:7:363:8 | vector.cpp:362:8:362:13 | AST only |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/vector.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/vector.cpp
@@ -348,7 +348,7 @@ void test_vector_output_iterator(int b) {
 	sink(v3); // tainted [NOT DETECTED]
 
 	for(std::vector<int>::iterator it = v4.begin(); it != v4.end(); ++it) {
-		*it = source();
+		taint_vector_output_iterator(it);
 	}
 	sink(v4); // tainted [NOT DETECTED by IR]
 	

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ void test_vector_output_iterator(int b) {`
`348`	`348`	`sink(v3); // tainted [NOT DETECTED]`
`349`	`349`
`350`	`350`	`for(std::vector<int>::iterator it = v4.begin(); it != v4.end(); ++it) {`
`351`		`- *it = source();`
	`351`	`+ taint_vector_output_iterator(it);`
`352`	`352`	`}`
`353`	`353`	`sink(v4); // tainted [NOT DETECTED by IR]`
`354`	`354`