On 10/29/2013 07:19 AM, Gao feng wrote:
Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com>
---
.gnulib | 2 +-
src/lxc/lxc_container.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gnulib b/.gnulib
index 8f74258..4a5ee89 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 8f7425866463f994538584d1dd7211603b8b0550
+Subproject commit 4a5ee89c8a8be7350a8fd8ca1bacb196a190e492
NACK to this hunk.
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 1ec59d5..255c711 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1042,10 +1042,10 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t
nttyPaths)
if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0)
return -1;
if (symlink(ttyPaths[i], tty) < 0) {
- VIR_FREE(tty);
virReportSystemError(errno,
_("Failed to symlink %s to %s"),
ttyPaths[i], tty);
+ VIR_FREE(tty);
return -1;
}
VIR_FREE(tty);
ACK and pushed.
(This was introduced by 0f31f7b. I've added that to the commit message)
Jan