From 08c80f998f5d9135aa5affc36ba7848a2bfa447e Mon Sep 17 00:00:00 2001 Message-Id: <08c80f998f5d9135aa5affc36ba7848a2bfa447e@dist-git> From: Pavel Hrdina Date: Tue, 2 Dec 2014 11:16:20 +0100 Subject: [PATCH] nwfilter: fix crash when adding non-existing nwfilter Adding non-existing nwfilter to a network interface device without any nwfilter specified will crash libvirt daemon with segfault. The reason is that the nwfilter is not found an libvirt will try to restore old nwfilter configuration but there is no nwfilter specified. Signed-off-by: Pavel Hrdina (cherry picked from commit d98ad8dd0c5a1d9f6a804e23f0568c784469c3fd) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1169409 Signed-off-by: Pavel Hrdina Signed-off-by: Jiri Denemark --- src/conf/nwfilter_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 52f24e4..24e0b68 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2770,7 +2770,7 @@ virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char *name) for (i = 0; i < nwfilters->count; i++) { virNWFilterObjLock(nwfilters->objs[i]); - if (STREQ(nwfilters->objs[i]->def->name, name)) + if (STREQ_NULLABLE(nwfilters->objs[i]->def->name, name)) return nwfilters->objs[i]; virNWFilterObjUnlock(nwfilters->objs[i]); } -- 2.2.0