From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 22 Jul 2019 02:01:43 +0000 (+0900)
Subject: pstore: remove temporary file on failure
X-Git-Tag: v243-rc1~74^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03c5f6cc02648eeff3179b2b762d46b9e1889bb1;p=thirdparty%2Fsystemd.git

pstore: remove temporary file on failure
---

diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index 58db27fe1ae..dfa95742d39 100644
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -170,8 +170,8 @@ static int move_file(PStoreEntry *pe, const char *subdir) {
 }
 
 static int write_dmesg(const char *dmesg, size_t size, const char *id) {
-        _cleanup_(unlink_and_freep) char *ofd_path = NULL;
-        _cleanup_free_ char *tmp_path = NULL;
+        _cleanup_(unlink_and_freep) char *tmp_path = NULL;
+        _cleanup_free_ char *ofd_path = NULL;
         _cleanup_close_ int ofd = -1;
         ssize_t wr;
         int r;
@@ -194,7 +194,7 @@ static int write_dmesg(const char *dmesg, size_t size, const char *id) {
         r = link_tmpfile(ofd, tmp_path, ofd_path);
         if (r < 0)
                 return log_error_errno(r, "Failed to write temporary file %s: %m", ofd_path);
-        ofd_path = mfree(ofd_path);
+        tmp_path = mfree(tmp_path);
 
         return 0;
 }