From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 28 Nov 2011 16:43:51 +0000 (+0100)
Subject: virsh: Don't traverse childless nodes in vshNodeIsSuperset
X-Git-Tag: v0.9.8-rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d0fc93fdd6de6d1bc2d3b1b2af69bdd51205f79;p=thirdparty%2Flibvirt.git

virsh: Don't traverse childless nodes in vshNodeIsSuperset

If both nodes do not have any children, we pass zero to
virBitmapAlloc which returns NULL. In turn we report OOM error
and return false (meaning nodes are different). This is not true.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 16d815c9ad..6ed249ba45 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -11556,6 +11556,9 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2)
     if (n1_child_size < n2_child_size)
         return false;
 
+    if (n1_child_size == 0 && n2_child_size == 0)
+        return true;
+
     if (!(bitmap = virBitmapAlloc(n1_child_size))) {
         virReportOOMError();
         return false;