From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 17 Jun 2014 09:02:54 +0000 (+0200)
Subject: vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ca9a94a0a92b1a2a3431bc7b78474ecf31437226;p=libvirt.git

vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren

On re-allocation failure the function would leak already allocated
memory.
---

diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 30ac6fe836..ced09525d9 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -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