From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 1 Feb 2021 11:12:42 +0000 (+0100)
Subject: libxlMakeDomBuildInfo: Don't use VIR_DISPOSE_N for USB device list
X-Git-Tag: v7.1.0-rc1~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b57b6b4eea86ef07c87530b6d337bd9cecd98736;p=thirdparty%2Flibvirt.git

libxlMakeDomBuildInfo: Don't use VIR_DISPOSE_N for USB device list

The list isn't secret which would need being disposed of. Just expand
the array and return failure when adding the NULL terminator similarly
to how we expand the list for adding devices in a loop.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 6a8ae27f54..cb1fd7df7d 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -686,7 +686,6 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
         /* NULL-terminate usbdevice_list */
         if (nusbdevice > 0 &&
             VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) {
-            VIR_DISPOSE_N(b_info->u.hvm.usbdevice_list, nusbdevice);
             return -1;
         }
 #endif