diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-13 11:15:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-02-13 11:15:41 +0100 |
| commit | 91ba5ac7d0196074863ff08f5251689d324a6550 (patch) | |
| tree | c12c05be46f21a42d30f2bf1b46d1207db49db89 /src/nspawn | |
| parent | Merge pull request #2601 from poettering/systemd-analyze-dump-align (diff) | |
| parent | resolve: always align flags to 8th column and print CAA flags (diff) | |
| download | systemd-91ba5ac7d0196074863ff08f5251689d324a6550.tar.xz systemd-91ba5ac7d0196074863ff08f5251689d324a6550.zip | |
Merge pull request #2589 from keszybz/resolve-tool-2
Better support of OPENPGPKEY, CAA, TLSA packets and tests
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index ef348c335b..5a68fec603 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2623,12 +2623,10 @@ static int inner_child( /* Automatically search for the init system */ - m = 1 + strv_length(arg_parameters); - a = newa(char*, m + 1); - if (strv_isempty(arg_parameters)) - a[1] = NULL; - else - memcpy(a + 1, arg_parameters, m * sizeof(char*)); + m = strv_length(arg_parameters); + a = newa(char*, m + 2); + memcpy_safe(a + 1, arg_parameters, m * sizeof(char*)); + a[1 + m] = NULL; a[0] = (char*) "/usr/lib/systemd/systemd"; execve(a[0], a, env_use); |