diff options
| author | Tobias Bergkvist <tobias@bergkv.ist> | 2021-12-01 23:07:30 +0100 |
|---|---|---|
| committer | Tobias Bergkvist <tobias@bergkv.ist> | 2021-12-01 23:07:30 +0100 |
| commit | 3997e9de6794e3227aa0c852647abda42d8a8fe6 (patch) | |
| tree | 18b42222cb96a4d55ff2e42b9a8fc079b4e5290f | |
| parent | 97d62a90f5ba28d6f16f40d20a679862394be8c2 (diff) | |
| download | nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.tar nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.tar.gz nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.tar.bz2 nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.tar.lz nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.tar.xz nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.tar.zst nixpkgs-3997e9de6794e3227aa0c852647abda42d8a8fe6.zip | |
Switch from malloc to calloc in addFlags
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-binary-wrapper.sh | 2 | ||||
| -rw-r--r-- | pkgs/test/make-binary-wrapper/add-flags.c | 2 | ||||
| -rw-r--r-- | pkgs/test/make-binary-wrapper/combination.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh index 29b7c2d845e..659a0293703 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh @@ -155,7 +155,7 @@ addFlags() { flag=$(escapeStringLiteral "${flags[$n]}") result="$result ${var}[$((n+1))] = \"$flag\";"$'\n' done - printf ' %s\n' "char **$var = malloc(sizeof(*$var) * ($((n+1)) + argc));" + printf ' %s\n' "char **$var = calloc($((n+1)) + argc, sizeof(*$var));" printf ' %s\n' "assert($var != NULL);" printf ' %s\n' "${var}[0] = argv[0];" printf '%s' "$result" diff --git a/pkgs/test/make-binary-wrapper/add-flags.c b/pkgs/test/make-binary-wrapper/add-flags.c index fccd5aa9402..20d3b7508c0 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.c +++ b/pkgs/test/make-binary-wrapper/add-flags.c @@ -7,7 +7,7 @@ #include <assert.h> int main(int argc, char **argv) { - char **argv_tmp = malloc(sizeof(*argv_tmp) * (5 + argc)); + char **argv_tmp = calloc(5 + argc, sizeof(*argv_tmp)); assert(argv_tmp != NULL); argv_tmp[0] = argv[0]; argv_tmp[1] = "-x"; diff --git a/pkgs/test/make-binary-wrapper/combination.c b/pkgs/test/make-binary-wrapper/combination.c index c476b24394d..4ab44281ef1 100644 --- a/pkgs/test/make-binary-wrapper/combination.c +++ b/pkgs/test/make-binary-wrapper/combination.c @@ -47,7 +47,7 @@ int main(int argc, char **argv) { set_env_suffix("PATH", ":", "/usr/local/bin/"); putenv("MESSAGE2=WORLD"); - char **argv_tmp = malloc(sizeof(*argv_tmp) * (4 + argc)); + char **argv_tmp = calloc(4 + argc, sizeof(*argv_tmp)); assert(argv_tmp != NULL); argv_tmp[0] = argv[0]; argv_tmp[1] = "-x"; |