From: John Ferlan <jferlan@redhat.com>
Date: Mon, 10 Apr 2017 12:33:08 +0000 (-0400)
Subject: conf: Fix virNodeDeviceObjGetNames nnames increment
X-Git-Tag: v3.3.0-rc1~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d3db9785b3bd32af4ebf4e1c2ede6f9a424bbf;p=thirdparty%2Flibvirt.git

conf: Fix virNodeDeviceObjGetNames nnames increment

To be safer, only increment nnames after the VIR_STRDUP is successful.
---

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 53df1b834e..75ba1a02da 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -512,10 +512,11 @@ virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
         virNodeDeviceObjLock(obj);
         if (aclfilter && aclfilter(conn, obj->def) &&
             (!cap || virNodeDeviceObjHasCap(obj, cap))) {
-            if (VIR_STRDUP(names[nnames++], obj->def->name) < 0) {
+            if (VIR_STRDUP(names[nnames], obj->def->name) < 0) {
                 virNodeDeviceObjUnlock(obj);
                 goto failure;
             }
+            nnames++;
         }
         virNodeDeviceObjUnlock(obj);
     }