hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14150 from michaelnebel/csharp/tracerwhitespace

Browse Source 
C#: Explicitly quote arguments in the LUA tracer on windows.
This commit is contained in:
Michael Nebel
2023-09-11 13:18:21 +02:00
committed by GitHub
parent 1b90216c98 d4a1c297aa
commit aaaf6f8616
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
csharp/ql/integration-tests/all-platforms/dotnet_run/test.py
View File

@@ -54,7 +54,6 @@ s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test7-db', 'dotne
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)

12
csharp/tools/tracing-config.lua
View File

@@ -64,7 +64,7 @@ function RegisterExtractorPack(id)
-- for `dotnet test`, we should not append `-p:UseSharedCompilation=false` to the command line
-- if an `exe` or `dll` is passed as an argument as the call is forwarded to vstest.
if testMatch and (arg:match('%.exe$') or arg:match('%.dll')) then
if testMatch and (arg:match('%.exe$') or arg:match('%.dll')) then
match = false
break
end
@@ -84,10 +84,6 @@ 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' }
@@ -114,7 +110,7 @@ function RegisterExtractorPack(id)
invocation = {
path = AbsolutifyExtractorPath(id, compilerPath),
arguments = {
commandLineString = table.concat(argv, " ")
commandLineString = ArgvToCommandLineString(argv)
}
}
}
@@ -178,7 +174,7 @@ function RegisterExtractorPack(id)
seenCompilerCall = true
end
if seenCompilerCall then
table.insert(extractorArgs, '"' .. arg .. '"')
table.insert(extractorArgs, arg)
end
end
@@ -188,7 +184,7 @@ function RegisterExtractorPack(id)
invocation = {
path = AbsolutifyExtractorPath(id, extractor),
arguments = {
commandLineString = table.concat(extractorArgs, " ")
commandLineString = ArgvToCommandLineString(extractorArgs)
}
}
}