C++: Add a couple more test cases and correct test models again.

geoffw0 · geoffw0 · commit a727255a8285 · 2024-01-24T15:18:49.000Z
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql
@@ -9,8 +9,9 @@ private class TestSources extends SourceModelCsv {
     row =
       [
         ";;false;localMadSource;;;ReturnValue;remote",
-        ";;false;remoteMadSource;;;ReturnValue;local",
-        ";;false;localMadSourceHasBody;;;ReturnValue;remote",
+        ";;false;remoteMadSource;;;ReturnValue;remote",
+        ";;false;localMadSourceVoid;;;ReturnValue;local",
+        ";;false;localMadSourceHasBody;;;ReturnValue;local",
         // TODO: remoteMadSourceIndirect
         ";;false;remoteMadSourceArg0;;;Argument[0];remote",
         ";;false;remoteMadSourceArg1;;;Argument[1];remote", ";;false;remoteMadSourceVar;;;;remote",
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp b/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp
@@ -8,6 +8,7 @@ void sink(int val);
 int localMadSource();
 int remoteMadSource();
 int notASource();
+int localMadSourceVoid(void);
 int localMadSourceHasBody() { return 0; }
 int *remoteMadSourceIndirect();
 void remoteMadSourceArg0(int *x, int *y);
@@ -24,6 +25,7 @@ void test_sources() {
 	sink(localMadSource()); // $ ir
 	sink(remoteMadSource()); // $ ir
 	sink(notASource());
+	sink(localMadSourceVoid()); // $ ir
 	sink(localMadSourceHasBody()); // $ ir
 	sink(*remoteMadSourceIndirect()); // $ MISSING: ir
 
@@ -37,6 +39,9 @@ void test_sources() {
 	sink(d); // $ MISSING: ir
 
 	sink(remoteMadSourceVar); // $ MISSING: ir
+
+	int e = localMadSource();
+	sink(e); // $ ir
 }
 
 void remoteMadSourceParam0(int x)
