shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-27 13:57:26 +03:00
Code

logind: actually fail on OOM

Browse Source 
Since dacd6cee76a08331b8c8616c5f30f70ee49aa2f9 the two OOM's are
ignored as the value of r will be overwritten and we only log in
the fail section anyway.

This patch jumps to fail on OOM.

Note that this is different behavior compared to both the current
code and previous to dacd6cee76a08331b8c8616c5f30f70ee49aa2f9. Before
that commit we would log that saving the inhibit data failed, but
still write the file, though without the WHO/WHY section.

CID# 1313545
This commit is contained in:
Thomas Hindoe Paaboel Andersen 2015-08-13 23:36:08 +02:00
parent 3326332eb9
commit 88231eb62c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/login/logind-inhibit.c
View File

@ -109,20 +109,24 @@ int inhibitor_save(Inhibitor *i) {
_cleanup_free_ char *cc = NULL;
cc = cescape(i->who);
if (!cc)
if (!cc) {
r = -ENOMEM;
else
fprintf(f, "WHO=%s\n", cc);
goto fail;
}
fprintf(f, "WHO=%s\n", cc);
}
if (i->why) {
_cleanup_free_ char *cc = NULL;
cc = cescape(i->why);
if (!cc)
if (!cc) {
r = -ENOMEM;
else
fprintf(f, "WHY=%s\n", cc);
goto fail;
}
fprintf(f, "WHY=%s\n", cc);
}
if (i->fifo_path)