SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nspawn: use the return value from asprintf instead of checking the pointer

Browse Source 
If allocation fails, the value of the point is "undefined". In practice
this matters very little, but for consistency with rest of the code,
let's check the return value.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-10-23 11:57:55 -04:00
parent f60dad309a
commit 9aa2169eae
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-mount.c
+8 -14
View File
@@ -193,11 +193,9 @@ static int tmpfs_patch_options(
if ((userns && uid_shift != 0) || patch_ids) {
assert(uid_shift != UID_INVALID);
if (options)
(void) asprintf(&buf, "%s,uid=" UID_FMT ",gid=" UID_FMT, options, uid_shift, uid_shift);
else
(void) asprintf(&buf, "uid=" UID_FMT ",gid=" UID_FMT, uid_shift, uid_shift);
if (!buf)
if (asprintf(&buf, "%s%suid=" UID_FMT ",gid=" UID_FMT,
options ?: "", options ? "," : "",
uid_shift, uid_shift) < 0)
return -ENOMEM;
options = buf;
@@ -207,16 +205,12 @@ static int tmpfs_patch_options(
if (selinux_apifs_context) {
char *t;
if (options)
t = strjoin(options, ",context=\"", selinux_apifs_context, "\"");
else
t = strjoin("context=\"", selinux_apifs_context, "\"");
if (!t) {
free(buf);
return -ENOMEM;
}
t = strjoin(options ?: "", options ? "," : "",
"context=\"", selinux_apifs_context, "\"");
free(buf);
if (!t)
return -ENOMEM;
buf = t;
}
#endif