Skip to content

fix: escape individual items when constructing environment variables #3103

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

Open
kmr-ankitt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: escape individual items when constructing environment variables #3103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions source/dub/generators/generator.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,14 +1120,17 @@ const(string[string])[] makeCommandEnvironmentVariables(CommandType type,
import std.process : environment, escapeShellFileName;

string[string] env;
// TODO: do more elaborate things here
// TODO: escape/quote individual items appropriately
env["VERSIONS"] = join(build_settings.versions, " ");
env["LIBS"] = join(build_settings.libs, " ");
env["SOURCE_FILES"] = join(build_settings.sourceFiles, " ");
env["IMPORT_PATHS"] = join(build_settings.importPaths, " ");
env["C_IMPORT_PATHS"] = join(build_settings.cImportPaths, " ");
env["STRING_IMPORT_PATHS"] = join(build_settings.stringImportPaths, " ");

auto escapeJoin(const(string)[] args) {
return args.map!(escapeShellFileName).join(" ");
}

env["VERSIONS"] = escapeJoin(build_settings.versions);
env["LIBS"] = escapeJoin(build_settings.libs);
env["SOURCE_FILES"] = escapeJoin(build_settings.sourceFiles);
env["IMPORT_PATHS"] = escapeJoin(build_settings.importPaths);
env["C_IMPORT_PATHS"] = escapeJoin(build_settings.cImportPaths);
env["STRING_IMPORT_PATHS"] = escapeJoin(build_settings.stringImportPaths);

env["DC"] = settings.platform.compilerBinary;
env["DC_BASE"] = settings.platform.compiler;
Expand Down
Loading