From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 18 Sep 2014 12:25:05 +0000 (+0200)
Subject: Fix libvirtd crash when removing metadata
X-Git-Tag: v1.2.9-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288c47406cffa7a6eb9e9c29764850b0cdeb5508;p=thirdparty%2Flibvirt.git

Fix libvirtd crash when removing metadata

When trying to remove nonexistent metadata from XML, libvirt daemon
crashes due to dereferencing NULL pointer.

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1143955
---

diff --git a/src/util/virxml.c b/src/util/virxml.c
index a91da050a3..27ecf14a24 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -974,6 +974,9 @@ virXMLFindChildNodeByNs(xmlNodePtr root,
 {
     xmlNodePtr next;
 
+    if (!root)
+        return NULL;
+
     for (next = root->children; next; next = next->next) {
         if (next->ns &&
             STREQ_NULLABLE((const char *) next->ns->href, uri))