C++: Add MaD model for 'CSimpleMap'.

MathiasVP · MathiasVP · commit 74b6c9dcc757 · 2024-11-27T16:41:42.000Z
diff --git a/cpp/ql/lib/ext/CSimpleMap.model.yml b/cpp/ql/lib/ext/CSimpleMap.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["", "CSimpleMap", True, "Add", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["", "CSimpleMap", True, "GetValueAt", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "taint", "manual"]
+      - ["", "CSimpleMap", True, "Lookup", "", "", "Argument[-1].Element[@]", "ReturnValue.Element[@]", "value", "manual"]
+      - ["", "CSimpleMap", True, "SetAt", "", "", "Argument[*@1]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["", "CSimpleMap", True, "SetAtIndex", "", "", "Argument[*@2]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["", "CSimpleMap", True, "operator[]", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["", "CSimpleMap", True, "operator=", "", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
@@ -779,7 +779,7 @@ void test_CSimpleMap() {
   {
     CSimpleMap<char*, wchar_t*> a;
     a.Add("hello", x);
-    sink(a.Lookup("hello")); // $ MISSING: ir
+    sink(a.Lookup("hello")); // $ ir
   }
   {
     CSimpleMap<char*, wchar_t*> a;
@@ -800,11 +800,11 @@ void test_CSimpleMap() {
   {
     CSimpleMap<char*, wchar_t*> a;
     a.SetAt("hello", x);
-    sink(a.Lookup("hello")); // $ MISSING: ir
+    sink(a.Lookup("hello")); // $ ir
   }
   {
     CSimpleMap<char*, wchar_t*> a;
     a.SetAtIndex(0, "hello", x);
-    sink(a.Lookup("hello")); // $ MISSING: ir
+    sink(a.Lookup("hello")); // $ ir
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ void test_CSimpleMap() {`
`779`	`779`	`{`
`780`	`780`	`CSimpleMap<char, wchar_t> a;`
`781`	`781`	`a.Add("hello", x);`
`782`		`- sink(a.Lookup("hello")); // $ MISSING: ir`
	`782`	`+ sink(a.Lookup("hello")); // $ ir`
`783`	`783`	`}`
`784`	`784`	`{`
`785`	`785`	`CSimpleMap<char, wchar_t> a;`
`@@ -800,11 +800,11 @@ void test_CSimpleMap() {`
`800`	`800`	`{`
`801`	`801`	`CSimpleMap<char, wchar_t> a;`
`802`	`802`	`a.SetAt("hello", x);`
`803`		`- sink(a.Lookup("hello")); // $ MISSING: ir`
	`803`	`+ sink(a.Lookup("hello")); // $ ir`
`804`	`804`	`}`
`805`	`805`	`{`
`806`	`806`	`CSimpleMap<char, wchar_t> a;`
`807`	`807`	`a.SetAtIndex(0, "hello", x);`
`808`		`- sink(a.Lookup("hello")); // $ MISSING: ir`
	`808`	`+ sink(a.Lookup("hello")); // $ ir`
`809`	`809`	`}`
`810`	`810`	`}`