makeBinaryWrapper: protect wildcards in flags

This commit is contained in:
Ryan Hendrickson 2023-09-18 02:49:33 -04:00
parent 9acebc35f9
commit df8b425f89
4 changed files with 26 additions and 6 deletions

View file

@ -193,8 +193,23 @@ makeCWrapper() {
addFlags() { addFlags() {
local n flag before after var local n flag before after var
# Disable file globbing, since bash will otherwise try to find
# filenames matching the the value to be prefixed/suffixed if
# it contains characters considered wildcards, such as `?` and
# `*`. We want the value as is, except we also want to split
# it on on the separator; hence we can't quote it.
local reenableGlob=0
if [[ ! -o noglob ]]; then
reenableGlob=1
fi
set -o noglob
# shellcheck disable=SC2086 # shellcheck disable=SC2086
before=($1) after=($2) before=($1) after=($2)
if (( reenableGlob )); then
set +o noglob
fi
var="argv_tmp" var="argv_tmp"
printf '%s\n' "char **$var = calloc(${#before[@]} + argc + ${#after[@]} + 1, sizeof(*$var));" printf '%s\n' "char **$var = calloc(${#before[@]} + argc + ${#after[@]} + 1, sizeof(*$var));"
printf '%s\n' "assert($var != NULL);" printf '%s\n' "assert($var != NULL);"

View file

@ -3,19 +3,21 @@
#include <assert.h> #include <assert.h>
int main(int argc, char **argv) { int main(int argc, char **argv) {
char **argv_tmp = calloc(4 + argc + 2 + 1, sizeof(*argv_tmp)); char **argv_tmp = calloc(6 + argc + 2 + 1, sizeof(*argv_tmp));
assert(argv_tmp != NULL); assert(argv_tmp != NULL);
argv_tmp[0] = argv[0]; argv_tmp[0] = argv[0];
argv_tmp[1] = "-x"; argv_tmp[1] = "-x";
argv_tmp[2] = "-y"; argv_tmp[2] = "-y";
argv_tmp[3] = "-z"; argv_tmp[3] = "-z";
argv_tmp[4] = "-abc"; argv_tmp[4] = "-abc";
argv_tmp[5] = "-g";
argv_tmp[6] = "*.txt";
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
argv_tmp[4 + i] = argv[i]; argv_tmp[6 + i] = argv[i];
} }
argv_tmp[4 + argc + 0] = "-foo"; argv_tmp[6 + argc + 0] = "-foo";
argv_tmp[4 + argc + 1] = "-bar"; argv_tmp[6 + argc + 1] = "-bar";
argv_tmp[4 + argc + 2] = NULL; argv_tmp[6 + argc + 2] = NULL;
argv = argv_tmp; argv = argv_tmp;
argv[0] = "/send/me/flags"; argv[0] = "/send/me/flags";

View file

@ -1,3 +1,4 @@
--append-flags "-foo -bar" \ --append-flags "-foo -bar" \
--add-flags "-x -y -z" \ --add-flags "-x -y -z" \
--add-flags -abc --add-flags -abc \
--add-flags "-g *.txt"

View file

@ -4,5 +4,7 @@ SUBST_ARGV0
-y -y
-z -z
-abc -abc
-g
*.txt
-foo -foo
-bar -bar