From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Feb 2013 04:10:23 +0000 (+0100)
Subject: path-util: fix memory leak
X-Git-Tag: v198~305
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=91a6489d9949776605939fe65a2a6174ee719049;p=elogind.git

path-util: fix memory leak
---

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index ae12c0531..52ce65de6 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -135,7 +135,8 @@ char *path_make_absolute_cwd(const char *p) {
         if (path_is_absolute(p))
                 return strdup(p);
 
-        if (!(cwd = get_current_dir_name()))
+        cwd = get_current_dir_name();
+        if (!cwd)
                 return NULL;
 
         r = path_make_absolute(p, cwd);
@@ -190,7 +191,6 @@ char **path_strv_canonicalize(char **l) {
 
                 errno = 0;
                 u = canonicalize_file_name(t);
-
                 if (!u) {
                         if (errno == ENOENT)
                                 u = t;
@@ -201,7 +201,8 @@ char **path_strv_canonicalize(char **l) {
 
                                 continue;
                         }
-                }
+                } else
+                        free(t);
 
                 l[k++] = u;
         }