picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

systemctl: add missing OOM checks

Browse source
This commit is contained in:
Lennart Poettering 2019-01-28 19:30:42 +01:00
parent 8a1ef3bf8d
commit 9fc32cd9b3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/systemctl/systemctl.c
View file

@ -3543,8 +3543,15 @@ static int load_kexec_kernel(void) {
"Boot entry specifies multiple initrds, which is not supported currently.");
kernel = path_join(e->root, e->kernel);
if (!strv_isempty(e->initrd))
if (!kernel)
return log_oom();
if (!strv_isempty(e->initrd)) {
initrd = path_join(e->root, *e->initrd);
if (!initrd)
return log_oom();
}
options = strv_join(e->options, " ");
if (!options)
return log_oom();