Skip to content

Commit bebfe03

Browse files
committed
C++: Add missing model and accept test changes.
1 parent 8c07a3e commit bebfe03

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

cpp/ql/lib/ext/ComPtr.model.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ extensions:
1111
- ["Microsoft::WRL", "ComPtr", True, "AsWeak", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
1212
- ["Microsoft::WRL", "ComPtr", True, "Attach", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
1313
- ["Microsoft::WRL", "ComPtr<T>", True, "CopyTo", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
14+
- ["Microsoft::WRL", "ComPtr", True, "CopyTo<T>", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
1415
- ["Microsoft::WRL", "ComPtr", True, "CopyTo", "(REFIID,void **)", "", "Argument[-1].Element[@]", "Argument[**@1]", "value", "manual"]
1516
- ["Microsoft::WRL", "ComPtr", True, "Detach", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"]
1617
- ["Microsoft::WRL", "ComPtr", True, "Get", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"]

cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ void test_CopyTo()
13521352

13531353
int* raw2 = nullptr;
13541354
p3.CopyTo<int>(&raw2);
1355-
sink(*raw2); // $ MISSING: ast,ir
1355+
sink(*raw2); // $ ir MISSING: ast
13561356
}
13571357

13581358
void test_Swap()

cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5575,6 +5575,7 @@ signatureMatches
55755575
| atl.cpp:1285:13:1285:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 0 |
55765576
| atl.cpp:1285:13:1285:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 1 |
55775577
| atl.cpp:1285:13:1285:18 | CopyTo | (size_t,void **) | | __libc_alloc_buffer_allocate | 1 |
5578+
| atl.cpp:1288:13:1288:18 | CopyTo | (T **) | ComPtr | CopyTo<T> | 0 |
55785579
| bsd.cpp:12:5:12:10 | accept | (CURLM *,curl_socket_t,int *) | | curl_multi_socket | 2 |
55795580
| bsd.cpp:12:5:12:10 | accept | (Curl_easy *,ssize_t *,int *) | | Curl_GetFTPResponse | 2 |
55805581
| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) | | EVP_CipherFinal | 2 |
@@ -30175,6 +30176,7 @@ getSignatureParameterName
3017530176
| (Strtab *,size_t *) | | strtabfinalize | 0 | Strtab * |
3017630177
| (Strtab *,size_t *) | | strtabfinalize | 1 | size_t * |
3017730178
| (T *) | ComPtr | ComPtr<T> | 0 | func:0 * |
30179+
| (T **) | ComPtr | CopyTo<T> | 0 | func:0 ** |
3017830180
| (T **) | ComPtr<T> | CopyTo | 0 | class:0 ** |
3017930181
| (TLS_FEATURE *) | | TLS_FEATURE_free | 0 | TLS_FEATURE * |
3018030182
| (TLS_RL_RECORD *,const unsigned char *) | | ossl_tls_rl_record_set_seq_num | 0 | TLS_RL_RECORD * |

0 commit comments

Comments
 (0)