From 092d25451fa8458a9947e0409bb15f4a6e52bca0 Mon Sep 17 00:00:00 2001 From: Mathias Vorreiter Pedersen Date: Tue, 3 Feb 2026 11:45:30 +0000 Subject: [PATCH] C++: Fix Copilot comments. --- .../cpp/models/implementations/WinHttp.qll | 5 +-- .../dataflow/external-models/flow.expected | 36 +++++++++---------- .../dataflow/external-models/sources.expected | 12 +++---- .../dataflow/external-models/windows.cpp | 6 ++-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/WinHttp.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/WinHttp.qll index fccd1b68f8f..fb28e6ebe45 100644 --- a/cpp/ql/lib/semmle/code/cpp/models/implementations/WinHttp.qll +++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/WinHttp.qll @@ -2,12 +2,12 @@ private import cpp private import semmle.code.cpp.ir.dataflow.FlowSteps private import semmle.code.cpp.dataflow.new.DataFlow -/** The `WINHTTP_HEADER_NAME` classes from `winhttp.h`. */ +/** The `WINHTTP_HEADER_NAME` class from `winhttp.h`. */ class WinHttpHeaderName extends Class { WinHttpHeaderName() { this.hasGlobalName("_WINHTTP_HEADER_NAME") } } -/** The `WINHTTP_EXTENDED_HEADER` classes from `winhttp.h`. */ +/** The `WINHTTP_EXTENDED_HEADER` class from `winhttp.h`. */ class WinHttpExtendedHeader extends Class { WinHttpExtendedHeader() { this.hasGlobalName("_WINHTTP_EXTENDED_HEADER") } } @@ -32,6 +32,7 @@ private class WinHttpHeaderNameInheritingContent extends TaintInheritingContent, } } +/** The `URL_COMPONENTS` class from `winhttp.h`. */ class WinHttpUrlComponents extends Class { WinHttpUrlComponents() { this.hasGlobalName("_WINHTTP_URL_COMPONENTS") } } diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected index 5c77771c785..1e46060c97e 100644 --- a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected +++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected @@ -315,12 +315,12 @@ edges | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | windows.cpp:574:10:574:23 | access to array | provenance | | | windows.cpp:573:40:573:41 | *& ... | windows.cpp:521:17:521:37 | [summary param] *1 in RtlMoveVolatileMemory | provenance | | | windows.cpp:573:40:573:41 | *& ... | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | provenance | MaD:42 | -| windows.cpp:644:45:644:50 | WinHttpReadData output argument | windows.cpp:646:10:646:16 | * ... | provenance | Src:MaD:20 | -| windows.cpp:651:48:651:53 | WinHttpReadDataEx output argument | windows.cpp:653:10:653:16 | * ... | provenance | Src:MaD:21 | -| windows.cpp:658:62:658:67 | WinHttpQueryHeaders output argument | windows.cpp:660:10:660:16 | * ... | provenance | Src:MaD:16 | -| windows.cpp:668:70:668:79 | WinHttpQueryHeadersEx output argument | windows.cpp:672:10:672:29 | * ... | provenance | Src:MaD:18 | -| windows.cpp:668:82:668:87 | WinHttpQueryHeadersEx output argument | windows.cpp:670:10:670:16 | * ... | provenance | Src:MaD:19 | -| windows.cpp:668:105:668:112 | WinHttpQueryHeadersEx output argument | windows.cpp:674:10:674:27 | * ... | provenance | Src:MaD:17 | +| windows.cpp:645:45:645:50 | WinHttpReadData output argument | windows.cpp:647:10:647:16 | * ... | provenance | Src:MaD:20 | +| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | windows.cpp:654:10:654:16 | * ... | provenance | Src:MaD:21 | +| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | windows.cpp:661:10:661:16 | * ... | provenance | Src:MaD:16 | +| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | windows.cpp:673:10:673:29 | * ... | provenance | Src:MaD:18 | +| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | windows.cpp:671:10:671:16 | * ... | provenance | Src:MaD:19 | +| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | windows.cpp:675:10:675:27 | * ... | provenance | Src:MaD:17 | | windows.cpp:714:6:714:20 | [summary param] *0 in WinHttpCrackUrl | windows.cpp:714:6:714:20 | [summary param] *3 in WinHttpCrackUrl [Return] | provenance | MaD:43 | | windows.cpp:728:5:728:28 | ... = ... | windows.cpp:729:35:729:35 | *x | provenance | | | windows.cpp:728:12:728:28 | call to source | windows.cpp:728:5:728:28 | ... = ... | provenance | | @@ -615,18 +615,18 @@ nodes | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | semmle.label | RtlMoveVolatileMemory output argument | | windows.cpp:573:40:573:41 | *& ... | semmle.label | *& ... | | windows.cpp:574:10:574:23 | access to array | semmle.label | access to array | -| windows.cpp:644:45:644:50 | WinHttpReadData output argument | semmle.label | WinHttpReadData output argument | -| windows.cpp:646:10:646:16 | * ... | semmle.label | * ... | -| windows.cpp:651:48:651:53 | WinHttpReadDataEx output argument | semmle.label | WinHttpReadDataEx output argument | -| windows.cpp:653:10:653:16 | * ... | semmle.label | * ... | -| windows.cpp:658:62:658:67 | WinHttpQueryHeaders output argument | semmle.label | WinHttpQueryHeaders output argument | -| windows.cpp:660:10:660:16 | * ... | semmle.label | * ... | -| windows.cpp:668:70:668:79 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument | -| windows.cpp:668:82:668:87 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument | -| windows.cpp:668:105:668:112 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument | -| windows.cpp:670:10:670:16 | * ... | semmle.label | * ... | -| windows.cpp:672:10:672:29 | * ... | semmle.label | * ... | -| windows.cpp:674:10:674:27 | * ... | semmle.label | * ... | +| windows.cpp:645:45:645:50 | WinHttpReadData output argument | semmle.label | WinHttpReadData output argument | +| windows.cpp:647:10:647:16 | * ... | semmle.label | * ... | +| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | semmle.label | WinHttpReadDataEx output argument | +| windows.cpp:654:10:654:16 | * ... | semmle.label | * ... | +| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | semmle.label | WinHttpQueryHeaders output argument | +| windows.cpp:661:10:661:16 | * ... | semmle.label | * ... | +| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument | +| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument | +| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument | +| windows.cpp:671:10:671:16 | * ... | semmle.label | * ... | +| windows.cpp:673:10:673:29 | * ... | semmle.label | * ... | +| windows.cpp:675:10:675:27 | * ... | semmle.label | * ... | | windows.cpp:714:6:714:20 | [summary param] *0 in WinHttpCrackUrl | semmle.label | [summary param] *0 in WinHttpCrackUrl | | windows.cpp:714:6:714:20 | [summary param] *3 in WinHttpCrackUrl [Return] | semmle.label | [summary param] *3 in WinHttpCrackUrl [Return] | | windows.cpp:728:5:728:28 | ... = ... | semmle.label | ... = ... | diff --git a/cpp/ql/test/library-tests/dataflow/external-models/sources.expected b/cpp/ql/test/library-tests/dataflow/external-models/sources.expected index 9481e8634f6..c683d8539a0 100644 --- a/cpp/ql/test/library-tests/dataflow/external-models/sources.expected +++ b/cpp/ql/test/library-tests/dataflow/external-models/sources.expected @@ -26,9 +26,9 @@ | windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | local | | windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | local | | windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | local | -| windows.cpp:644:45:644:50 | WinHttpReadData output argument | remote | -| windows.cpp:651:48:651:53 | WinHttpReadDataEx output argument | remote | -| windows.cpp:658:62:658:67 | WinHttpQueryHeaders output argument | remote | -| windows.cpp:668:70:668:79 | WinHttpQueryHeadersEx output argument | remote | -| windows.cpp:668:82:668:87 | WinHttpQueryHeadersEx output argument | remote | -| windows.cpp:668:105:668:112 | WinHttpQueryHeadersEx output argument | remote | +| windows.cpp:645:45:645:50 | WinHttpReadData output argument | remote | +| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | remote | +| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | remote | +| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | remote | +| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | remote | +| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | remote | diff --git a/cpp/ql/test/library-tests/dataflow/external-models/windows.cpp b/cpp/ql/test/library-tests/dataflow/external-models/windows.cpp index 4e8ab6a6609..2900af9034c 100644 --- a/cpp/ql/test/library-tests/dataflow/external-models/windows.cpp +++ b/cpp/ql/test/library-tests/dataflow/external-models/windows.cpp @@ -577,7 +577,6 @@ void test_copy_and_move_memory() { using HINTERNET = void*; using ULONGLONG = unsigned long long; -using LPCWSTR = const wchar_t*; using UINT = unsigned int; using PDWORD = DWORD*; using PCSTR = const char*; @@ -613,6 +612,8 @@ DWORD WinHttpReadDataEx( PVOID pvProperty ); +using LPCWSTR = const wchar_t*; + BOOL WinHttpQueryHeaders( HINTERNET hRequest, DWORD dwInfoLevel, @@ -655,7 +656,7 @@ void test_winhttp(HINTERNET hRequest) { { char buffer[1024]; DWORD bufferLength = sizeof(buffer); - DWORD result = WinHttpQueryHeaders(hRequest, 0, nullptr, buffer, &bufferLength, nullptr); + WinHttpQueryHeaders(hRequest, 0, nullptr, buffer, &bufferLength, nullptr); sink(buffer); sink(*buffer); // $ ir } @@ -691,7 +692,6 @@ using INTERNET_SCHEME = enum { INTERNET_SCHEME_LAST = 10 }; using INTERNET_PORT = unsigned short; -using LPCWSTR = const wchar_t*; typedef struct _WINHTTP_URL_COMPONENTS { DWORD dwStructSize;