Merge pull request #948 from phomes/master

logind: actually fail on OOM
2015-08-14 13:31:36 +02:00
parent c5974b33e7 88231eb62c
commit 6c269e6402
1 changed files with 10 additions and 6 deletions
@@ -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)