Skip to content

Commit 092d254

Browse files
MathiasVPMathiasVP
committed
C++: Fix Copilot comments.
1 parent 32b86ec commit 092d254

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

‎cpp/ql/lib/semmle/code/cpp/models/implementations/WinHttp.qll‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ private import cpp
22
private import semmle.code.cpp.ir.dataflow.FlowSteps
33
private import semmle.code.cpp.dataflow.new.DataFlow
44

5-
/** The `WINHTTP_HEADER_NAME` classes from `winhttp.h`. */
5+
/** The `WINHTTP_HEADER_NAME` class from `winhttp.h`. */
66
class WinHttpHeaderName extends Class {
77
WinHttpHeaderName() { this.hasGlobalName("_WINHTTP_HEADER_NAME") }
88
}
99

10-
/** The `WINHTTP_EXTENDED_HEADER` classes from `winhttp.h`. */
10+
/** The `WINHTTP_EXTENDED_HEADER` class from `winhttp.h`. */
1111
class WinHttpExtendedHeader extends Class {
1212
WinHttpExtendedHeader() { this.hasGlobalName("_WINHTTP_EXTENDED_HEADER") }
1313
}
@@ -32,6 +32,7 @@ private class WinHttpHeaderNameInheritingContent extends TaintInheritingContent,
3232
}
3333
}
3434

35+
/** The `URL_COMPONENTS` class from `winhttp.h`. */
3536
class WinHttpUrlComponents extends Class {
3637
WinHttpUrlComponents() { this.hasGlobalName("_WINHTTP_URL_COMPONENTS") }
3738
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@ edges
315315
| windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | windows.cpp:574:10:574:23 | access to array | provenance | |
316316
| windows.cpp:573:40:573:41 | *& ... | windows.cpp:521:17:521:37 | [summary param] *1 in RtlMoveVolatileMemory | provenance | |
317317
| windows.cpp:573:40:573:41 | *& ... | windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | provenance | MaD:42 |
318-
| windows.cpp:644:45:644:50 | WinHttpReadData output argument | windows.cpp:646:10:646:16 | * ... | provenance | Src:MaD:20 |
319-
| windows.cpp:651:48:651:53 | WinHttpReadDataEx output argument | windows.cpp:653:10:653:16 | * ... | provenance | Src:MaD:21 |
320-
| windows.cpp:658:62:658:67 | WinHttpQueryHeaders output argument | windows.cpp:660:10:660:16 | * ... | provenance | Src:MaD:16 |
321-
| windows.cpp:668:70:668:79 | WinHttpQueryHeadersEx output argument | windows.cpp:672:10:672:29 | * ... | provenance | Src:MaD:18 |
322-
| windows.cpp:668:82:668:87 | WinHttpQueryHeadersEx output argument | windows.cpp:670:10:670:16 | * ... | provenance | Src:MaD:19 |
323-
| windows.cpp:668:105:668:112 | WinHttpQueryHeadersEx output argument | windows.cpp:674:10:674:27 | * ... | provenance | Src:MaD:17 |
318+
| windows.cpp:645:45:645:50 | WinHttpReadData output argument | windows.cpp:647:10:647:16 | * ... | provenance | Src:MaD:20 |
319+
| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | windows.cpp:654:10:654:16 | * ... | provenance | Src:MaD:21 |
320+
| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | windows.cpp:661:10:661:16 | * ... | provenance | Src:MaD:16 |
321+
| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | windows.cpp:673:10:673:29 | * ... | provenance | Src:MaD:18 |
322+
| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | windows.cpp:671:10:671:16 | * ... | provenance | Src:MaD:19 |
323+
| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | windows.cpp:675:10:675:27 | * ... | provenance | Src:MaD:17 |
324324
| 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 |
325325
| windows.cpp:728:5:728:28 | ... = ... | windows.cpp:729:35:729:35 | *x | provenance | |
326326
| windows.cpp:728:12:728:28 | call to source | windows.cpp:728:5:728:28 | ... = ... | provenance | |
@@ -615,18 +615,18 @@ nodes
615615
| windows.cpp:573:27:573:37 | RtlMoveVolatileMemory output argument | semmle.label | RtlMoveVolatileMemory output argument |
616616
| windows.cpp:573:40:573:41 | *& ... | semmle.label | *& ... |
617617
| windows.cpp:574:10:574:23 | access to array | semmle.label | access to array |
618-
| windows.cpp:644:45:644:50 | WinHttpReadData output argument | semmle.label | WinHttpReadData output argument |
619-
| windows.cpp:646:10:646:16 | * ... | semmle.label | * ... |
620-
| windows.cpp:651:48:651:53 | WinHttpReadDataEx output argument | semmle.label | WinHttpReadDataEx output argument |
621-
| windows.cpp:653:10:653:16 | * ... | semmle.label | * ... |
622-
| windows.cpp:658:62:658:67 | WinHttpQueryHeaders output argument | semmle.label | WinHttpQueryHeaders output argument |
623-
| windows.cpp:660:10:660:16 | * ... | semmle.label | * ... |
624-
| windows.cpp:668:70:668:79 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument |
625-
| windows.cpp:668:82:668:87 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument |
626-
| windows.cpp:668:105:668:112 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument |
627-
| windows.cpp:670:10:670:16 | * ... | semmle.label | * ... |
628-
| windows.cpp:672:10:672:29 | * ... | semmle.label | * ... |
629-
| windows.cpp:674:10:674:27 | * ... | semmle.label | * ... |
618+
| windows.cpp:645:45:645:50 | WinHttpReadData output argument | semmle.label | WinHttpReadData output argument |
619+
| windows.cpp:647:10:647:16 | * ... | semmle.label | * ... |
620+
| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | semmle.label | WinHttpReadDataEx output argument |
621+
| windows.cpp:654:10:654:16 | * ... | semmle.label | * ... |
622+
| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | semmle.label | WinHttpQueryHeaders output argument |
623+
| windows.cpp:661:10:661:16 | * ... | semmle.label | * ... |
624+
| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument |
625+
| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument |
626+
| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | semmle.label | WinHttpQueryHeadersEx output argument |
627+
| windows.cpp:671:10:671:16 | * ... | semmle.label | * ... |
628+
| windows.cpp:673:10:673:29 | * ... | semmle.label | * ... |
629+
| windows.cpp:675:10:675:27 | * ... | semmle.label | * ... |
630630
| windows.cpp:714:6:714:20 | [summary param] *0 in WinHttpCrackUrl | semmle.label | [summary param] *0 in WinHttpCrackUrl |
631631
| windows.cpp:714:6:714:20 | [summary param] *3 in WinHttpCrackUrl [Return] | semmle.label | [summary param] *3 in WinHttpCrackUrl [Return] |
632632
| windows.cpp:728:5:728:28 | ... = ... | semmle.label | ... = ... |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
| windows.cpp:318:23:318:37 | *call to MapViewOfFileEx | local |
2727
| windows.cpp:325:23:325:42 | *call to MapViewOfFileFromApp | local |
2828
| windows.cpp:332:23:332:40 | *call to MapViewOfFileNuma2 | local |
29-
| windows.cpp:644:45:644:50 | WinHttpReadData output argument | remote |
30-
| windows.cpp:651:48:651:53 | WinHttpReadDataEx output argument | remote |
31-
| windows.cpp:658:62:658:67 | WinHttpQueryHeaders output argument | remote |
32-
| windows.cpp:668:70:668:79 | WinHttpQueryHeadersEx output argument | remote |
33-
| windows.cpp:668:82:668:87 | WinHttpQueryHeadersEx output argument | remote |
34-
| windows.cpp:668:105:668:112 | WinHttpQueryHeadersEx output argument | remote |
29+
| windows.cpp:645:45:645:50 | WinHttpReadData output argument | remote |
30+
| windows.cpp:652:48:652:53 | WinHttpReadDataEx output argument | remote |
31+
| windows.cpp:659:47:659:52 | WinHttpQueryHeaders output argument | remote |
32+
| windows.cpp:669:70:669:79 | WinHttpQueryHeadersEx output argument | remote |
33+
| windows.cpp:669:82:669:87 | WinHttpQueryHeadersEx output argument | remote |
34+
| windows.cpp:669:105:669:112 | WinHttpQueryHeadersEx output argument | remote |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,6 @@ void test_copy_and_move_memory() {
577577

578578
using HINTERNET = void*;
579579
using ULONGLONG = unsigned long long;
580-
using LPCWSTR = const wchar_t*;
581580
using UINT = unsigned int;
582581
using PDWORD = DWORD*;
583582
using PCSTR = const char*;
@@ -613,6 +612,8 @@ DWORD WinHttpReadDataEx(
613612
PVOID pvProperty
614613
);
615614

615+
using LPCWSTR = const wchar_t*;
616+
616617
BOOL WinHttpQueryHeaders(
617618
HINTERNET hRequest,
618619
DWORD dwInfoLevel,
@@ -655,7 +656,7 @@ void test_winhttp(HINTERNET hRequest) {
655656
{
656657
char buffer[1024];
657658
DWORD bufferLength = sizeof(buffer);
658-
DWORD result = WinHttpQueryHeaders(hRequest, 0, nullptr, buffer, &bufferLength, nullptr);
659+
WinHttpQueryHeaders(hRequest, 0, nullptr, buffer, &bufferLength, nullptr);
659660
sink(buffer);
660661
sink(*buffer); // $ ir
661662
}
@@ -691,7 +692,6 @@ using INTERNET_SCHEME = enum {
691692
INTERNET_SCHEME_LAST = 10
692693
};
693694
using INTERNET_PORT = unsigned short;
694-
using LPCWSTR = const wchar_t*;
695695

696696
typedef struct _WINHTTP_URL_COMPONENTS {
697697
DWORD dwStructSize;

0 commit comments

Comments
 (0)