Skip to content

Commit ddf0f37

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent e59de9a commit ddf0f37

File tree

3 files changed

+28
-9
lines changed

3 files changed

+28
-9
lines changed

‎cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
| Dubious member name "operator LPWSTR" in summary model. |
77
| Dubious member name "operator PCXSTR" in summary model. |
88
| Dubious member name "operator PXSTR" in summary model. |
9+
| Dubious member name "operator void**" in summary model. |
910
| Dubious member name "operator&" in summary model. |
1011
| Dubious member name "operator*" in summary model. |
1112
| Dubious member name "operator+" in summary model. |
1213
| Dubious member name "operator+=" in summary model. |
1314
| Dubious member name "operator->" in summary model. |
1415
| Dubious member name "operator=" in summary model. |
16+
| Dubious member name "operator=<U>" in summary model. |
1517
| Dubious member name "operator[]" in summary model. |
1618
| Dubious signature "(..(*)(..))" in summary model. |
1719
| Dubious signature "(..(*)(..),..(*)(..),..(*)(..),..(*)(..))" in summary model. |
@@ -2497,6 +2499,7 @@
24972499
| Dubious signature "(TS_VERIFY_CTX *,unsigned char *,long)" in summary model. |
24982500
| Dubious signature "(TXT_DB *,OPENSSL_STRING *)" in summary model. |
24992501
| Dubious signature "(TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC)" in summary model. |
2502+
| Dubious signature "(U *)" in summary model. |
25002503
| Dubious signature "(UI *)" in summary model. |
25012504
| Dubious signature "(UI *,UI_STRING *,const char *)" in summary model. |
25022505
| Dubious signature "(UI *,UI_STRING *,const char *,int)" in summary model. |

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,41 +1421,41 @@ void test_address_of_deref_operators() {
14211421
Microsoft::WRL::ComPtr<int> p1(new int(x));
14221422
Microsoft::WRL::Details::ComPtrRef<Microsoft::WRL::ComPtr<int>> pp = &p1;
14231423
Microsoft::WRL::ComPtr<int>* qq = *pp;
1424-
sink(*qq->Get()); // $ MISSING: ast,ir
1424+
sink(*qq->Get()); // $ ir MISSING: ast
14251425

14261426
const Microsoft::WRL::ComPtr<int> p2(new int(x));
14271427
Microsoft::WRL::Details::ComPtrRef<const Microsoft::WRL::ComPtr<int>> pp2 = &p2;
14281428
const Microsoft::WRL::ComPtr<int>* qq2 = *pp2;
1429-
sink(*qq2->Get()); // $ MISSING: ast,ir
1429+
sink(*qq2->Get()); // $ ir MISSING: ast
14301430

14311431
S s;
14321432
s.x = source<int>();
14331433
Microsoft::WRL::ComPtr<S> p3(&s);
1434-
sink(p3->x); // $ MISSING: ast,ir
1434+
sink(p3->x); // $ ir MISSING: ast
14351435
}
14361436

14371437
void test_assignments() {
14381438
Microsoft::WRL::ComPtr<int> p1;
14391439
p1 = new int(source<int>());
1440-
sink(*p1.Get()); // $ MISSING: ast,ir
1440+
sink(*p1.Get()); // $ ir MISSING: ast
14411441

14421442
Microsoft::WRL::ComPtr<int> p2;
14431443
p2 = new long(source<long>());
1444-
sink(*p2.Get()); // $ MISSING: ast,ir
1444+
sink(*p2.Get()); // $ ir MISSING: ast
14451445

14461446
Microsoft::WRL::ComPtr<int> p3;
14471447
p3 = p1;
1448-
sink(*p3.Get()); // $ MISSING: ast,ir
1448+
sink(*p3.Get()); // $ ir MISSING: ast
14491449

14501450
Microsoft::WRL::ComPtr<long> p4;
14511451
p4 = p1;
1452-
sink(*p4.Get()); // $ MISSING: ast,ir
1452+
sink(*p4.Get()); // $ ir MISSING: ast
14531453

14541454
Microsoft::WRL::ComPtr<int> p5;
14551455
p5 = std::move(p1);
1456-
sink(*p5.Get()); // $ MISSING: ast,ir
1456+
sink(*p5.Get()); // $ ir MISSING: ast
14571457

14581458
Microsoft::WRL::ComPtr<long> p6;
14591459
p6 = std::move(p1);
1460-
sink(*p6.Get()); // $ MISSING: ast,ir
1460+
sink(*p6.Get()); // $ ir MISSING: ast
14611461
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5568,20 +5568,30 @@ signatureMatches
55685568
| atl.cpp:1231:5:1231:12 | CStrBufT | (unsigned char *,int,unsigned long) | | UTF8_putc | 1 |
55695569
| atl.cpp:1231:5:1231:12 | CStrBufT | (unsigned char *,int,unsigned long) | | UTF8_putc | 2 |
55705570
| atl.cpp:1286:5:1286:10 | ComPtr | (const ComPtr &) | ComPtr | ComPtr | 0 |
5571+
| atl.cpp:1286:5:1286:10 | ComPtr | (const ComPtr &) | ComPtr | operator= | 0 |
55715572
| atl.cpp:1287:5:1287:10 | ComPtr | (ComPtr &&) | ComPtr | ComPtr | 0 |
5573+
| atl.cpp:1287:5:1287:10 | ComPtr | (ComPtr &&) | ComPtr | operator= | 0 |
55725574
| atl.cpp:1290:5:1290:10 | ComPtr | (T *) | ComPtr | ComPtr<T> | 0 |
55735575
| atl.cpp:1290:5:1290:10 | ComPtr | (T *) | ComPtr | ComPtr<T> | 0 |
5576+
| atl.cpp:1290:5:1290:10 | ComPtr | (U *) | ComPtr | operator=<U> | 0 |
5577+
| atl.cpp:1290:5:1290:10 | ComPtr | (U *) | ComPtr | operator=<U> | 0 |
55745578
| atl.cpp:1301:13:1301:18 | CopyTo | (T **) | ComPtr<T> | CopyTo | 0 |
55755579
| atl.cpp:1303:13:1303:18 | CopyTo | (Curl_easy *,void **) | | Curl_resolver_init | 1 |
55765580
| atl.cpp:1303:13:1303:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 0 |
55775581
| atl.cpp:1303:13:1303:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 1 |
55785582
| atl.cpp:1303:13:1303:18 | CopyTo | (size_t,void **) | | __libc_alloc_buffer_allocate | 1 |
55795583
| atl.cpp:1306:13:1306:18 | CopyTo | (T **) | ComPtr | CopyTo<T> | 0 |
5584+
| atl.cpp:1328:13:1328:21 | operator= | (T *) | ComPtr<T> | operator= | 0 |
55805585
| atl.cpp:1330:13:1330:21 | operator= | (T *) | ComPtr | ComPtr<T> | 0 |
5586+
| atl.cpp:1330:13:1330:21 | operator= | (U *) | ComPtr | operator=<U> | 0 |
55815587
| atl.cpp:1331:13:1331:21 | operator= | (const ComPtr &) | ComPtr | ComPtr | 0 |
5588+
| atl.cpp:1331:13:1331:21 | operator= | (const ComPtr &) | ComPtr | operator= | 0 |
55825589
| atl.cpp:1333:13:1333:21 | operator= | (const ComPtr &) | ComPtr | ComPtr | 0 |
5590+
| atl.cpp:1333:13:1333:21 | operator= | (const ComPtr &) | ComPtr | operator= | 0 |
55835591
| atl.cpp:1334:13:1334:21 | operator= | (ComPtr &&) | ComPtr | ComPtr | 0 |
5592+
| atl.cpp:1334:13:1334:21 | operator= | (ComPtr &&) | ComPtr | operator= | 0 |
55845593
| atl.cpp:1336:13:1336:21 | operator= | (ComPtr &&) | ComPtr | ComPtr | 0 |
5594+
| atl.cpp:1336:13:1336:21 | operator= | (ComPtr &&) | ComPtr | operator= | 0 |
55855595
| bsd.cpp:12:5:12:10 | accept | (CURLM *,curl_socket_t,int *) | | curl_multi_socket | 2 |
55865596
| bsd.cpp:12:5:12:10 | accept | (Curl_easy *,ssize_t *,int *) | | Curl_GetFTPResponse | 2 |
55875597
| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) | | EVP_CipherFinal | 2 |
@@ -9401,6 +9411,8 @@ signatureMatches
94019411
| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
94029412
| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
94039413
| stl.h:335:37:335:43 | emplace | (format_string,Args &&) | | format<Args> | 1 |
9414+
| stl.h:351:12:351:21 | shared_ptr | (T *) | ComPtr<T> | operator= | 0 |
9415+
| stl.h:369:12:369:21 | unique_ptr | (T *) | ComPtr<T> | operator= | 0 |
94049416
| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
94059417
| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
94069418
| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
@@ -21766,6 +21778,7 @@ getSignatureParameterName
2176621778
| (CURLU *,const char *,char **,OperationConfig *) | | ipfs_url_rewrite | 2 | char ** |
2176721779
| (CURLU *,const char *,char **,OperationConfig *) | | ipfs_url_rewrite | 3 | OperationConfig * |
2176821780
| (ComPtr &&) | ComPtr | ComPtr | 0 | ComPtr && |
21781+
| (ComPtr &&) | ComPtr | operator= | 0 | ComPtr && |
2176921782
| (CompoundDictionary *,const PreparedDictionary *) | | AttachPreparedDictionary | 0 | CompoundDictionary * |
2177021783
| (CompoundDictionary *,const PreparedDictionary *) | | AttachPreparedDictionary | 1 | const PreparedDictionary * |
2177121784
| (Curl_cfilter *) | | Curl_conn_cf_is_ssl | 0 | Curl_cfilter * |
@@ -30182,6 +30195,7 @@ getSignatureParameterName
3018230195
| (Strtab *,size_t *) | | strtabfinalize | 0 | Strtab * |
3018330196
| (Strtab *,size_t *) | | strtabfinalize | 1 | size_t * |
3018430197
| (T *) | ComPtr | ComPtr<T> | 0 | func:0 * |
30198+
| (T *) | ComPtr<T> | operator= | 0 | class:0 * |
3018530199
| (T **) | ComPtr | CopyTo<T> | 0 | func:0 ** |
3018630200
| (T **) | ComPtr<T> | CopyTo | 0 | class:0 ** |
3018730201
| (TLS_FEATURE *) | | TLS_FEATURE_free | 0 | TLS_FEATURE * |
@@ -30376,6 +30390,7 @@ getSignatureParameterName
3037630390
| (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) | | TXT_DB_create_index | 2 | ..(*)(..) |
3037730391
| (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) | | TXT_DB_create_index | 3 | OPENSSL_LH_HASHFUNC |
3037830392
| (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) | | TXT_DB_create_index | 4 | OPENSSL_LH_COMPFUNC |
30393+
| (U *) | ComPtr | operator=<U> | 0 | func:0 * |
3037930394
| (UI *) | | UI_get0_user_data | 0 | UI * |
3038030395
| (UI *) | | UI_get_method | 0 | UI * |
3038130396
| (UI *,UI_STRING *,const char *) | | UI_set_result | 0 | UI * |
@@ -33327,6 +33342,7 @@ getSignatureParameterName
3332733342
| (const CURLU *,CURLUPart,char **,unsigned int) | | curl_url_get | 2 | char ** |
3332833343
| (const CURLU *,CURLUPart,char **,unsigned int) | | curl_url_get | 3 | unsigned int |
3332933344
| (const ComPtr &) | ComPtr | ComPtr | 0 | const ComPtr & |
33345+
| (const ComPtr &) | ComPtr | operator= | 0 | const ComPtr & |
3333033346
| (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) | | BrotliBuildHistogramsWithContext | 0 | const Command * |
3333133347
| (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) | | BrotliBuildHistogramsWithContext | 1 | const size_t |
3333233348
| (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) | | BrotliBuildHistogramsWithContext | 2 | const BlockSplit * |

0 commit comments

Comments
 (0)