Skip to content

C#: Quoting hotfix. #14185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2023
Merged

C#: Quoting hotfix. #14185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fe9b70
C#: Poor mans quoting of arguments on windows.
michaelnebel Sep 8, 2023
7bcaa49
C#: Add integration test with quoted arguments.
michaelnebel Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions csharp/ql/integration-tests/all-platforms/dotnet_run/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,9 @@ def check_build_out(msg, s):
s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test7-db', 'dotnet build', 'dotnet run --no-build hello world'], "test8-db")
check_build_out("hello, world", s)
check_diagnostics(test_db="test8-db")


# two arguments, no '--' (first argument quoted)
s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test8-db', 'dotnet run "hello world part1" part2'], "test9-db")
check_build_out("hello world part1, part2", s)
check_diagnostics(test_db="test9-db")
4 changes: 4 additions & 0 deletions csharp/tools/tracing-config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ function RegisterExtractorPack(id)
dotnetRunNeedsSeparator = false
dotnetRunInjectionIndex = i
end
-- if we encounter a whitespace, we explicitly need to quote the argument.
if OperatingSystem == 'windows' and arg:match('%s') then
argv[i] = '"' .. arg .. '"'
end
end
if match then
local injections = { '-p:UseSharedCompilation=false', '-p:EmitCompilerGeneratedFiles=true' }
Expand Down