C++: Fix mistake in test model.

geoffw0 · geoffw0 · commit 40270e1f70fb · 2024-03-25T11:20:55.000Z
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/FlowSummaryNode.expected b/cpp/ql/test/library-tests/dataflow/models-as-data/FlowSummaryNode.expected
@@ -22,6 +22,9 @@
 | tests.cpp:139:5:139:32 | [summary param] 0 indirection in madArg0IndirectFieldToReturn | ParameterNode | madArg0IndirectFieldToReturn | madArg0IndirectFieldToReturn |
 | tests.cpp:139:5:139:32 | [summary] read: Argument[0 indirection].Field[value] in madArg0IndirectFieldToReturn |  | madArg0IndirectFieldToReturn | madArg0IndirectFieldToReturn |
 | tests.cpp:139:5:139:32 | [summary] to write: ReturnValue in madArg0IndirectFieldToReturn | ReturnNode | madArg0IndirectFieldToReturn | madArg0IndirectFieldToReturn |
+| tests.cpp:140:5:140:32 | [summary param] 0 in madArg0FieldIndirectToReturn | ParameterNode | madArg0FieldIndirectToReturn | madArg0FieldIndirectToReturn |
+| tests.cpp:140:5:140:32 | [summary] read: Argument[0].*Field[ptr] in madArg0FieldIndirectToReturn |  | madArg0FieldIndirectToReturn | madArg0FieldIndirectToReturn |
+| tests.cpp:140:5:140:32 | [summary] to write: ReturnValue in madArg0FieldIndirectToReturn | ReturnNode | madArg0FieldIndirectToReturn | madArg0FieldIndirectToReturn |
 | tests.cpp:141:13:141:32 | [summary param] 0 in madArg0ToReturnField | ParameterNode | madArg0ToReturnField | madArg0ToReturnField |
 | tests.cpp:141:13:141:32 | [summary] to write: ReturnValue in madArg0ToReturnField | ReturnNode | madArg0ToReturnField | madArg0ToReturnField |
 | tests.cpp:141:13:141:32 | [summary] to write: ReturnValue.Field[value] in madArg0ToReturnField |  | madArg0ToReturnField | madArg0ToReturnField |
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/testModels.qll b/cpp/ql/test/library-tests/dataflow/models-as-data/testModels.qll
@@ -79,7 +79,7 @@ private class TestSummaries extends SummaryModelCsv {
         ";;false;madArg0IndirectToArg1Indirect;;;*Argument[0];*Argument[1];taint",
         ";;false;madArg0FieldToReturn;;;Argument[0].value;ReturnValue;taint",
         ";;false;madArg0IndirectFieldToReturn;;;*Argument[0].value;ReturnValue;taint",
-        ";;false;madArg0FieldIndirectToReturn;;;Argument[0].*value;ReturnValue;taint",
+        ";;false;madArg0FieldIndirectToReturn;;;Argument[0].*ptr;ReturnValue;taint",
         ";;false;madArg0ToReturnField;;;Argument[0];ReturnValue.value;taint",
         ";;false;madArg0ToReturnIndirectField;;;Argument[0];*ReturnValue.value;taint",
         ";;false;madArg0ToReturnFieldIndirect;;;Argument[0];ReturnValue.*ptr;taint",
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
@@ -185,7 +185,7 @@ void test_summaries() {
 	mc2.ptr = &e;
 	sink(madArg0FieldToReturn(mc2)); // $ ir
 	sink(madArg0IndirectFieldToReturn(&mc2)); // $ ir
-	sink(madArg0FieldIndirectToReturn(mc2)); // $ MISSING: ir
+	sink(madArg0FieldIndirectToReturn(mc2)); // $ ir
 
 	sink(madArg0ToReturnField(0).value);
 	sink(madArg0ToReturnField(source()).value); // $ ir
