[libvirt] [PATCH 2/3] vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren
On re-allocation failure the function would leak already allocated
memory.
---
src/vbox/vbox_snapshot_conf.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 30ac6fe..69c7e42 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -483,18 +483,24 @@ virVBoxSnapshotConfAllChildren(virVBoxSnapshotConfHardDiskPtr disk,
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++) {
ret[returnSize - tempSize + j] = tempList[j];
}
}
if (VIR_EXPAND_N(ret, returnSize, 1) < 0)
- return 0;
+ goto error;
ret[returnSize - 1] = disk;
*list = ret;
return returnSize;
+
+ error:
+ for (i = 0; i < returnSize; i++)
+ virVboxSnapshotConfHardDiskFree(ret[i]);
+ VIR_FREE(ret);
+ return 0;
}
void
--
1.9.3