From: John Ferlan <jferlan@redhat.com>
Date: Thu, 5 May 2016 22:32:25 +0000 (-0400)
Subject: admin: Clean up error path in adminServerListClients
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=70e9114e7c376151fdc209c13a42c9b2fd4f4f43;p=libvirt.git

admin: Clean up error path in adminServerListClients

Coverity noted that in adminServerListClients if virNetServerGetClients
returns a -1 into ret, then the call virObjectListFreeCount in cleanup
will not be very happy.

Adjust the code to skip the cleanup label and just return -1 if
virNetServerGetClients fails.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/daemon/admin_server.c b/daemon/admin_server.c
index 2fc467539c..41f6e82736 100644
--- a/daemon/admin_server.c
+++ b/daemon/admin_server.c
@@ -191,14 +191,13 @@ adminServerListClients(virNetServerPtr srv,
     virCheckFlags(0, -1);
 
     if ((ret = virNetServerGetClients(srv, &clts)) < 0)
-        goto cleanup;
+        return -1;
 
     if (clients) {
         *clients = clts;
         clts = NULL;
     }
 
- cleanup:
     virObjectListFreeCount(clts, ret);
     return ret;
 }