shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-08-24 09:49:59 +03:00
Code Releases Activity

virDomainIothreadMappingDefParse: Fix usage of virXMLNodeGetSubelementList

Browse Source 
virXMLNodeGetSubelementList always returns a non-NULL pointers thus we
should check the length instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
2025-02-25 12:42:49 +01:00
parent fcd47086f4
commit 0ee6848ca5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -7970,19 +7970,21 @@ virDomainIothreadMappingDefParse(xmlNodePtr driverNode,
if (!(iothreadsNode = virXMLNodeGetSubelement(driverNode, "iothreads"))) if (!(iothreadsNode = virXMLNodeGetSubelement(driverNode, "iothreads")))
return 0; return 0;
if (!(iothreadNodes = virXMLNodeGetSubelementList(iothreadsNode, "iothread"))) iothreadNodes = virXMLNodeGetSubelementList(iothreadsNode, "iothread");
if (iothreadNodes->len == 0)
return 0; return 0;
for (i = 0; i < iothreadNodes->len; i++) { for (i = 0; i < iothreadNodes->len; i++) {
xmlNodePtr iothNode = g_ptr_array_index(iothreadNodes, i); xmlNodePtr iothNode = g_ptr_array_index(iothreadNodes, i);
g_autoptr(virDomainIothreadMappingDef) iothdef = g_new0(virDomainIothreadMappingDef, 1); g_autoptr(virDomainIothreadMappingDef) iothdef = g_new0(virDomainIothreadMappingDef, 1);
g_autoptr(GPtrArray) queueNodes = NULL; g_autoptr(GPtrArray) queueNodes = virXMLNodeGetSubelementList(iothNode, "queue");
if (virXMLPropUInt(iothNode, "id", 10, VIR_XML_PROP_REQUIRED, if (virXMLPropUInt(iothNode, "id", 10, VIR_XML_PROP_REQUIRED,
&iothdef->id) < 0) &iothdef->id) < 0)
return -1; return -1;
if ((queueNodes = virXMLNodeGetSubelementList(iothNode, "queue"))) { if (queueNodes->len > 0) {
size_t q; size_t q;
iothdef->queues = g_new0(unsigned int, queueNodes->len); iothdef->queues = g_new0(unsigned int, queueNodes->len);