Uh oh!
There was an error while loading. Please reload this page.
C++: Add Windows command line and environment models#19563
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| category: feature | ||
| --- | ||
| * Added the `pCmdLine` arguments of `WinMain` and `wWinMain` as local flow sources. | ||
| * Added source models for `GetCommandLineA`, `GetCommandLineW`, `GetEnvironmentStringsA`, `GetEnvironmentStringsW`, `GetEnvironmentVariableA`, and `GetEnvironmentVariableW`. | ||
| * Added summary models for `CommandLineToArgvA` and `CommandLineToArgvW`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # partial model of windows system calls | ||
| extensions: | ||
| - addsTo: | ||
| pack: codeql/cpp-all | ||
| extensible: sourceModel | ||
| data: # namespace, type, subtypes, name, signature, ext, output, kind, provenance | ||
| # processenv.h | ||
| - ["", "", False, "GetCommandLineA", "", "", "ReturnValue[*]", "local", "manual"] | ||
| - ["", "", False, "GetCommandLineW", "", "", "ReturnValue[*]", "local", "manual"] | ||
| - ["", "", False, "GetEnvironmentStringsA", "", "", "ReturnValue[*]", "local", "manual"] | ||
| - ["", "", False, "GetEnvironmentStringsW", "", "", "ReturnValue[*]", "local", "manual"] | ||
| - ["", "", False, "GetEnvironmentVariableA", "", "", "Argument[*1]", "local", "manual"] | ||
| - ["", "", False, "GetEnvironmentVariableW", "", "", "Argument[*1]", "local", "manual"] | ||
| - addsTo: | ||
| pack: codeql/cpp-all | ||
| extensible: summaryModel | ||
| data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance | ||
| # shellapi.h | ||
| - ["", "", False, "CommandLineToArgvA", "", "", "Argument[*0]", "ReturnValue[**]", "taint", "manual"] | ||
| - ["", "", False, "CommandLineToArgvW", "", "", "Argument[*0]", "ReturnValue[**]", "taint", "manual"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -55,7 +55,7 @@ private class LocalModelSource extends LocalFlowSource { | ||
| } | ||
| /** | ||
| * A local data flow source that is the `argv` parameter to `main` or `wmain`. | ||
| */ | ||
| private class ArgvSource extends LocalFlowSource { | ||
| ArgvSource() { | ||
| @@ -69,6 +69,21 @@ private class ArgvSource extends LocalFlowSource { | ||
| override string getSourceType() { result = "a command-line argument" } | ||
| } | ||
| /** | ||
| * A local data flow source that is the `pCmdLine` parameter to `WinMain` or `wWinMain`. | ||
| */ | ||
| private class CmdLineSource extends LocalFlowSource { | ||
| CmdLineSource() { | ||
| exists(Function main, Parameter pCmdLine | | ||
| main.hasGlobalName(["WinMain", "wWinMain"]) and | ||
| main.getParameter(2) = pCmdLine and | ||
| this.asParameter(1) = pCmdLine | ||
jketema marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| ) | ||
| } | ||
| override string getSourceType() { result = "a command-line" } | ||
| } | ||
| /** | ||
| * A remote data flow source that is defined through 'models as data'. | ||
| */ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| void sink(char); | ||
| void sink(char*); | ||
| int WinMain(void *hInstance, void *hPrevInstance, char *pCmdLine, int nCmdShow) { // $ ast-def=hInstance ast-def=hPrevInstance ast-def=pCmdLine ir-def=*hInstance ir-def=*hPrevInstance ir-def=*pCmdLine | ||
| sink(pCmdLine); | ||
| sink(*pCmdLine); // $ ir | ||
| return 0; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| | asio_streams.cpp:87:34:87:44 | read_until output argument | remote | | ||
| | test.cpp:10:10:10:18 | call to ymlSource | local | | ||
| | windows.cpp:11:15:11:29 | *call to GetCommandLineA | local | | ||
| | windows.cpp:23:17:23:38 | *call to GetEnvironmentStringsA | local | | ||
| | windows.cpp:28:36:28:38 | GetEnvironmentVariableA output argument | local | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| void sink(char); | ||
| void sink(char*); | ||
| void sink(char**); | ||
| char* GetCommandLineA(); | ||
| char** CommandLineToArgvA(char*, int*); | ||
| char* GetEnvironmentStringsA(); | ||
| int GetEnvironmentVariableA(const char*, char*, int); | ||
| void getCommandLine() { | ||
| char* cmd = GetCommandLineA(); | ||
Contributor There was a problem hiding this comment. I believe these | ||
| sink(cmd); | ||
| sink(*cmd); // $ ir | ||
| int argc; | ||
| char** argv = CommandLineToArgvA(cmd, &argc); | ||
| sink(argv); | ||
| sink(argv[1]); | ||
| sink(*argv[1]); // $ ir | ||
| } | ||
| void getEnvironment() { | ||
| char* env = GetEnvironmentStringsA(); | ||
| sink(env); | ||
| sink(*env); // $ ir | ||
| char buf[1024]; | ||
| GetEnvironmentVariableA("FOO", buf, sizeof(buf)); | ||
| sink(buf); | ||
| sink(*buf); // $ ir | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Acknowledging I saw this. Will fix this in a separate PR.