[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.6.3-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 35898d3087882477bbba157826109677fcb209e1
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon May 4 21:42:33 2009 +0200

    fix crash when libvirt_lxc is called without arguments

diff --git a/debian/patches/0005-don-t-crash-with-def-NULL.patch b/debian/patches/0005-don-t-crash-with-def-NULL.patch
new file mode 100644
index 0000000..9921b44
--- /dev/null
+++ b/debian/patches/0005-don-t-crash-with-def-NULL.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 4 May 2009 21:29:15 +0200
+Subject: [PATCH] don't crash with def == NULL
+
+happens when calling libvirt_lxc without arguments
+---
+ src/lxc_controller.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxc_controller.c b/src/lxc_controller.c
+index 3f9add2..e0fb05d 100644
+--- a/src/lxc_controller.c
++++ b/src/lxc_controller.c
+@@ -745,7 +745,8 @@ int main(int argc, char *argv[])
+ 
+ 
+ cleanup:
+-    virFileDeletePid(LXC_STATE_DIR, def->name);
++    if (def)
++        virFileDeletePid(LXC_STATE_DIR, def->name);
+     lxcControllerCleanupInterfaces(nveths, veths);
+     unlink(sockpath);
+     VIR_FREE(sockpath);
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a8c0f9e..b0fea9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
+0005-don-t-crash-with-def-NULL.patch

-- 
Libvirt debian packaging