]> xenbits.xensource.com Git - libvirt.git/commitdiff
vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren
authorPeter Krempa <pkrempa@redhat.com>
Tue, 17 Jun 2014 09:02:54 +0000 (11:02 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 17 Jun 2014 11:28:39 +0000 (13:28 +0200)
On re-allocation failure the function would leak already allocated
memory.

src/vbox/vbox_snapshot_conf.c

index 30ac6fe8367aac01dc2fae4dcc56d9f2c0d30909..ced09525d9440b08d0d44803d8038a381d75c6cd 100644 (file)
@@ -477,24 +477,32 @@ virVBoxSnapshotConfAllChildren(virVBoxSnapshotConfHardDiskPtr disk,
     virVBoxSnapshotConfHardDiskPtr *tempList = NULL;
     size_t i = 0;
     size_t j = 0;
+
     if (VIR_ALLOC_N(ret, 0) < 0)
         return 0;
 
     for (i = 0; i < disk->nchildren; i++) {
         tempSize = virVBoxSnapshotConfAllChildren(disk->children[i], &tempList);
         if (VIR_EXPAND_N(ret, returnSize, tempSize) < 0)
-            return 0;
+            goto error;
 
-        for (j = 0; j < tempSize; j++) {
+        for (j = 0; j < tempSize; j++)
             ret[returnSize - tempSize + j] = tempList[j];
-        }
+
+        VIR_FREE(tempList);
     }
+
     if (VIR_EXPAND_N(ret, returnSize, 1) < 0)
-        return 0;
+        goto error;
 
     ret[returnSize - 1] = disk;
     *list = ret;
     return returnSize;
+
+ error:
+    VIR_FREE(tempList);
+    VIR_FREE(ret);
+    return 0;
 }
 
 void