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

journal-file: check asprintf return value in the usual fashion

Browse source 
This is unlikely to fail, but we cannot rely on asprintf return value
on failure, so let's just be correct here.

CID #1368236.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-01-31 11:36:08 -05:00
parent 25cb94d431
commit 7645c77b9b
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/journal/journal-file.c
View file

@ -3087,13 +3087,18 @@ int journal_file_open(
}
}
if (fname)
if (fname) {
f->path = strdup(fname);
else /* If we don't know the path, fill in something explanatory and vaguely useful */
asprintf(&f->path, "/proc/self/%i", fd);
if (!f->path) {
r = -ENOMEM;
goto fail;
if (!f->path) {
r = -ENOMEM;
goto fail;
}
} else {
/* If we don't know the path, fill in something explanatory and vaguely useful */
if (asprintf(&f->path, "/proc/self/%i", fd) < 0) {
r = -ENOMEM;
goto fail;
}
}
f->chain_cache = ordered_hashmap_new(&uint64_hash_ops);