C++: Add missing model and accept test changes.

MathiasVP · MathiasVP · commit bebfe031660f · 2025-08-27T15:15:26.000+02:00
diff --git a/cpp/ql/lib/ext/ComPtr.model.yml b/cpp/ql/lib/ext/ComPtr.model.yml
@@ -11,6 +11,7 @@ extensions:
       - ["Microsoft::WRL", "ComPtr", True, "AsWeak", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
       - ["Microsoft::WRL", "ComPtr", True, "Attach", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
       - ["Microsoft::WRL", "ComPtr<T>", True, "CopyTo", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "CopyTo<T>", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
       - ["Microsoft::WRL", "ComPtr", True, "CopyTo", "(REFIID,void **)", "", "Argument[-1].Element[@]", "Argument[**@1]", "value", "manual"]
       - ["Microsoft::WRL", "ComPtr", True, "Detach", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"]
       - ["Microsoft::WRL", "ComPtr", True, "Get", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "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
@@ -1352,7 +1352,7 @@ void test_CopyTo()
 
   int* raw2 = nullptr;
   p3.CopyTo<int>(&raw2);
-  sink(*raw2); // $ MISSING: ast,ir
+  sink(*raw2); // $ ir MISSING: ast
 }
 
 void test_Swap()
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
@@ -5575,6 +5575,7 @@ signatureMatches
 | atl.cpp:1285:13:1285:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 0 |
 | atl.cpp:1285:13:1285:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 1 |
 | atl.cpp:1285:13:1285:18 | CopyTo | (size_t,void **) |  | __libc_alloc_buffer_allocate | 1 |
+| atl.cpp:1288:13:1288:18 | CopyTo | (T **) | ComPtr | CopyTo<T> | 0 |
 | bsd.cpp:12:5:12:10 | accept | (CURLM *,curl_socket_t,int *) |  | curl_multi_socket | 2 |
 | bsd.cpp:12:5:12:10 | accept | (Curl_easy *,ssize_t *,int *) |  | Curl_GetFTPResponse | 2 |
 | bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_CipherFinal | 2 |
@@ -30175,6 +30176,7 @@ getSignatureParameterName
 | (Strtab *,size_t *) |  | strtabfinalize | 0 | Strtab * |
 | (Strtab *,size_t *) |  | strtabfinalize | 1 | size_t * |
 | (T *) | ComPtr | ComPtr<T> | 0 | func:0 * |
+| (T **) | ComPtr | CopyTo<T> | 0 | func:0 ** |
 | (T **) | ComPtr<T> | CopyTo | 0 | class:0 ** |
 | (TLS_FEATURE *) |  | TLS_FEATURE_free | 0 | TLS_FEATURE * |
 | (TLS_RL_RECORD *,const unsigned char *) |  | ossl_tls_rl_record_set_seq_num | 0 | TLS_RL_RECORD * |

Original file line number	Diff line number	Diff line change
`@@ -1352,7 +1352,7 @@ void test_CopyTo()`
`1352`	`1352`
`1353`	`1353`	`int* raw2 = nullptr;`
`1354`	`1354`	`p3.CopyTo<int>(&raw2);`
`1355`		`- sink(*raw2); // $ MISSING: ast,ir`
	`1355`	`+ sink(*raw2); // $ ir MISSING: ast`
`1356`	`1356`	`}`
`1357`	`1357`
`1358`	`1358`	`void test_Swap()`