[systemd-commits] 2 commits - src/nspawn src/shared

[Tom Gundersen]

 src/nspawn/nspawn.c    |    2 +-
 src/shared/path-util.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 080e78329a742dd95bdee321fee81c305e073491
Author: Tom Gundersen <teg at jklm.no>
Date:   Tue Jan 6 19:50:25 2015 +0100

    nspawn: fix error message when mknod fails

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 89bbf2b..e5a24dd 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1291,7 +1291,7 @@ static int copy_devnodes(const char *dest) {
                         }
 
                         if (mknod(to, st.st_mode, st.st_rdev) < 0)
-                                return log_error_errno(errno, "mknod(%s) failed: %m", dest);
+                                return log_error_errno(errno, "mknod(%s) failed: %m", to);
                 }
         }
 

commit a0539d7753d6a3ede87bf5e57d7c40d5bc1dc230
Author: Tom Gundersen <teg at jklm.no>
Date:   Tue Jan 6 19:12:38 2015 +0100

    path-util: plug leak

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index ad9dc88..ee87c74 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -524,6 +524,9 @@ fallback:
                 return -errno;
         }
 
+        free(parent);
+        parent = NULL;
+
         r = path_get_parent(t, &parent);
         if (r < 0)
                 return r;