From d89544f67250907f84dd67bf402a2615500a73d3 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 22 Oct 2019 16:08:07 +0200 Subject: [PATCH] remote: Replace VIR_ALLOC_N with g_new0 in remoteRelayDomainEventGraphics Allocate the array of graphics identity objects using g_new0 to allow dropping the 'error' label. Signed-off-by: Peter Krempa ACKed-by: Eric Blake --- src/remote/remote_daemon_dispatch.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index f292f8b8e6..1ea9528817 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -596,8 +596,8 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, data.remote.service = g_strdup(remote->service); data.subject.subject_len = subject->nidentity; - if (VIR_ALLOC_N(data.subject.subject_val, data.subject.subject_len) < 0) - goto error; + data.subject.subject_val = g_new0(remote_domain_event_graphics_identity, + data.subject.subject_len); for (i = 0; i < data.subject.subject_len; i++) { data.subject.subject_val[i].type = g_strdup(subject->identities[i].type); @@ -619,11 +619,6 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_lifecycle_msg, - (char *) &data); - return -1; } static int -- GitLab