]> xenbits.xensource.com Git - libvirt.git/commitdiff
admin_server: Avoid accessing unallocated memory
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 25 Mar 2016 09:18:00 +0000 (10:18 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 25 Mar 2016 09:18:00 +0000 (10:18 +0100)
In 68b726b93c11cc90 we tried to fix a mem leak. However, it
wasn't done quite well. Problem is, virNetDaemonGetServers() may
fail in which case virObjectListFreeCount() would be called with
-1 objects to free. But the number of elements is taken in
unsigned rather than signed integer.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
daemon/admin_server.c

index 85cec4627c8ac3ef15fed78856e95ea3b40a5921..1d30ea50792d7c060ad49194e21fa7498860f8a6 100644 (file)
@@ -54,7 +54,8 @@ adminConnectListServers(virNetDaemonPtr dmn,
         srvs = NULL;
     }
  cleanup:
-    virObjectListFreeCount(srvs, ret);
+    if (ret > 0)
+        virObjectListFreeCount(srvs, ret);
     return ret;
 }