From: Václav Pavlín <vpavlin@redhat.com>
Date: Wed, 27 Mar 2013 14:16:37 +0000 (+0100)
Subject: shared: free dt (temporary dir name) on fail
X-Git-Tag: v200~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f36a783ca7b8200d4e865a49342e44929c0f4c06

shared: free dt (temporary dir name) on fail

[zj: modified to not to try to rmdir() dir we haven't created.]
---

diff --git a/src/shared/util.c b/src/shared/util.c
index 0444cf445..8fa01fa8a 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5708,7 +5708,7 @@ int create_tmp_dir(char template[], char** dir_name) {
         dt = strjoin(d, "/tmp", NULL);
         if (!dt) {
                 r = log_oom();
-                goto fail2;
+                goto fail3;
         }
 
         umask(0000);
@@ -5716,7 +5716,7 @@ int create_tmp_dir(char template[], char** dir_name) {
         if (r) {
                 log_error("Can't create directory %s: %m", dt);
                 r = -errno;
-                goto fail1;
+                goto fail2;
         }
         log_debug("Created temporary directory %s", dt);
 
@@ -5734,6 +5734,8 @@ int create_tmp_dir(char template[], char** dir_name) {
 fail1:
         rmdir(dt);
 fail2:
+        free(dt);
+fail3:
         rmdir(template);
         return r;
 }