From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 2 Dec 2022 10:02:58 +0000 (+0100)
Subject: virNetworkDHCPRangeDefParseXML: Use virXMLNodeGetSubelement to find 'lease'
X-Git-Tag: v9.1.0-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bd0e8674cedde9a3456d8fa05e80dd69079611b;p=thirdparty%2Flibvirt.git

virNetworkDHCPRangeDefParseXML: Use virXMLNodeGetSubelement to find 'lease'

This also prevents a potential memleak when multiple elements would be
present.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index b98ae6aa3f..e33925f857 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -453,7 +453,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName,
                                virNetworkDHCPRangeDef *range)
 {
     virSocketAddrRange *addr = &range->addr;
-    xmlNodePtr cur = node->children;
+    xmlNodePtr lease;
     g_autofree char *start = NULL;
     g_autofree char *end = NULL;
 
@@ -480,15 +480,9 @@ virNetworkDHCPRangeDefParseXML(const char *networkName,
                               virNetworkIPDefPrefix(ipdef)) < 0)
         return -1;
 
-    while (cur != NULL) {
-        if (cur->type == XML_ELEMENT_NODE &&
-            virXMLNodeNameEqual(cur, "lease")) {
-
-            if (virNetworkDHCPLeaseTimeDefParseXML(&range->lease, cur) < 0)
-                return -1;
-        }
-        cur = cur->next;
-    }
+    if ((lease = virXMLNodeGetSubelement(node, "lease")) &&
+        virNetworkDHCPLeaseTimeDefParseXML(&range->lease, lease) < 0)
+        return -1;
 
     return 0;
 }