External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2021-06-14 14:56:15 +02:00
parent 7f58028c2b
commit 640e987b61
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/remote/remote_daemon_dispatch.c
View File

@ -7327,7 +7327,7 @@ remoteDispatchDomainAuthorizedSshKeysGet(virNetServer *server G_GNUC_UNUSED,
int rv = -1; int rv = -1;
virConnectPtr conn = remoteGetHypervisorConn(client); virConnectPtr conn = remoteGetHypervisorConn(client);
int nkeys = 0; int nkeys = 0;
char **keys = NULL; g_auto(GStrv) keys = NULL;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
if (!conn) if (!conn)
@ -7355,8 +7355,6 @@ remoteDispatchDomainAuthorizedSshKeysGet(virNetServer *server G_GNUC_UNUSED,
cleanup: cleanup:
if (rv < 0) if (rv < 0)
virNetMessageSaveError(rerr); virNetMessageSaveError(rerr);
if (nkeys > 0)
virStringListFreeCount(keys, nkeys);
virObjectUnref(dom); virObjectUnref(dom);
return rv; return rv;
@ -7409,7 +7407,7 @@ remoteDispatchDomainGetMessages(virNetServer *server G_GNUC_UNUSED,
int rv = -1; int rv = -1;
virConnectPtr conn = remoteGetHypervisorConn(client); virConnectPtr conn = remoteGetHypervisorConn(client);
int nmsgs = 0; int nmsgs = 0;
char **msgs = NULL; g_auto(GStrv) msgs = NULL;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
if (!conn) if (!conn)
@ -7436,8 +7434,6 @@ remoteDispatchDomainGetMessages(virNetServer *server G_GNUC_UNUSED,
cleanup: cleanup:
if (rv < 0) if (rv < 0)
virNetMessageSaveError(rerr); virNetMessageSaveError(rerr);
if (nmsgs > 0)
virStringListFreeCount(msgs, nmsgs);
virObjectUnref(dom); virObjectUnref(dom);
return rv; return rv;