From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 14 Jun 2021 12:56:15 +0000 (+0200)
Subject: remote: dispatch: Don't use virStringListFreeCount for NULL terminated lists
X-Git-Tag: v7.7.0-rc1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=640e987b61810546bf3e48b12b710d3d224b1e16;p=thirdparty%2Flibvirt.git

remote: dispatch: Don't use virStringListFreeCount for NULL terminated lists

Both virDomainAuthorizedSSHKeysGet and virDomainGetMessages return a
NULL-terminated string-list, so we can use g_auto(GStrv) to clear the
used memory on failures.

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

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 0e38b314a2..0bac7d4f51 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -7327,7 +7327,7 @@ remoteDispatchDomainAuthorizedSshKeysGet(virNetServer *server G_GNUC_UNUSED,
     int rv = -1;
     virConnectPtr conn = remoteGetHypervisorConn(client);
     int nkeys = 0;
-    char **keys = NULL;
+    g_auto(GStrv) keys = NULL;
     virDomainPtr dom = NULL;
 
     if (!conn)
@@ -7355,8 +7355,6 @@ remoteDispatchDomainAuthorizedSshKeysGet(virNetServer *server G_GNUC_UNUSED,
  cleanup:
     if (rv < 0)
         virNetMessageSaveError(rerr);
-    if (nkeys > 0)
-        virStringListFreeCount(keys, nkeys);
     virObjectUnref(dom);
 
     return rv;
@@ -7409,7 +7407,7 @@ remoteDispatchDomainGetMessages(virNetServer *server G_GNUC_UNUSED,
     int rv = -1;
     virConnectPtr conn = remoteGetHypervisorConn(client);
     int nmsgs = 0;
-    char **msgs = NULL;
+    g_auto(GStrv) msgs = NULL;
     virDomainPtr dom = NULL;
 
     if (!conn)
@@ -7436,8 +7434,6 @@ remoteDispatchDomainGetMessages(virNetServer *server G_GNUC_UNUSED,
  cleanup:
     if (rv < 0)
         virNetMessageSaveError(rerr);
-    if (nmsgs > 0)
-        virStringListFreeCount(msgs, nmsgs);
     virObjectUnref(dom);
 
     return rv;