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

nspawn: use free_and_replace() at more places

Browse source
This commit is contained in:
Lennart Poettering 2018-04-27 22:03:14 +02:00
parent 88614c8a28
commit 10af01a5ff
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nspawn/nspawn-mount.c
View file

@ -133,8 +133,7 @@ int custom_mount_prepare_all(const char *dest, CustomMount *l, size_t n) {
if (!s)
return log_oom();
free(m->source);
m->source = s;
free_and_replace(m->source, s);
} else {
/* No source specified? In that case, use a throw-away temporary directory in /var/tmp */
@ -165,8 +164,7 @@ int custom_mount_prepare_all(const char *dest, CustomMount *l, size_t n) {
if (!s)
return log_oom();
free(*j);
*j = s;
free_and_replace(*j, s);
}
if (m->work_dir) {
@ -176,8 +174,7 @@ int custom_mount_prepare_all(const char *dest, CustomMount *l, size_t n) {
if (!s)
return log_oom();
free(m->work_dir);
m->work_dir = s;
free_and_replace(m->work_dir, s);
} else {
assert(m->source);