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

[Guido Günther]

The following commit has been merged in the master branch:
commit 70fbcb6e66ab56832bfa61e7bfeb0f854caefe6b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Apr 19 18:10:29 2010 +0200

    New patch 0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
    
    nwfilter: Don't crash if driverState == NULL
    
    Closes: #577728

diff --git a/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch b/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
new file mode 100644
index 0000000..7f31d9f
--- /dev/null
+++ b/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
@@ -0,0 +1,34 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 19 Apr 2010 18:06:05 +0200
+Subject: [PATCH] nwfilter: Don't crash if driverState == NULL
+
+Origin: Upstream
+Closes: #577728
+---
+ src/nwfilter/nwfilter_driver.c |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
+index f237b7c..9fbfaa7 100644
+--- a/src/nwfilter/nwfilter_driver.c
++++ b/src/nwfilter/nwfilter_driver.c
+@@ -161,9 +161,16 @@ nwfilterDriverReload(void) {
+  */
+ static int
+ nwfilterDriverActive(void) {
+-    if (!driverState->pools.count)
++    int ret;
++
++    if (!driverState)
+         return 0;
+-    return 1;
++
++    nwfilterDriverLock(driverState);
++    ret = driverState->pools.count ? 1 : 0;
++    nwfilterDriverUnlock(driverState);
++
++    return ret;
+ }
+ 
+ /**
+-- 

-- 
Libvirt Debian packaging