Commit 9529609a by S.Çağlar Onur Committed by Serge Hallyn

fix memory leaks reported by cppcheck in src/lxc/bdev.c

parent dceb6c80
...@@ -962,8 +962,10 @@ static int lvm_snapshot(const char *orig, const char *path, unsigned long size) ...@@ -962,8 +962,10 @@ static int lvm_snapshot(const char *orig, const char *path, unsigned long size)
// check if the original lv is backed by a thin pool, in which case we // check if the original lv is backed by a thin pool, in which case we
// cannot specify a size that's different from the original size. // cannot specify a size that's different from the original size.
ret = lvm_is_thin_volume(orig); ret = lvm_is_thin_volume(orig);
if (ret == -1) if (ret == -1) {
free(pathdup);
return -1; return -1;
}
if (!ret) { if (!ret) {
ret = execlp("lvcreate", "lvcreate", "-s", "-L", sz, "-n", lv, orig, (char *)NULL); ret = execlp("lvcreate", "lvcreate", "-s", "-L", sz, "-n", lv, orig, (char *)NULL);
...@@ -1282,6 +1284,7 @@ static int btrfs_subvolume_create(const char *path) ...@@ -1282,6 +1284,7 @@ static int btrfs_subvolume_create(const char *path)
p = strrchr(newfull, '/'); p = strrchr(newfull, '/');
if (!p) { if (!p) {
ERROR("bad path: %s", path); ERROR("bad path: %s", path);
free(newfull);
return -1; return -1;
} }
*p = '\0'; *p = '\0';
...@@ -1418,6 +1421,7 @@ static int btrfs_destroy(struct bdev *orig) ...@@ -1418,6 +1421,7 @@ static int btrfs_destroy(struct bdev *orig)
p = strrchr(newfull, '/'); p = strrchr(newfull, '/');
if (!p) { if (!p) {
ERROR("bad path: %s", path); ERROR("bad path: %s", path);
free(newfull);
return -1; return -1;
} }
*p = '\0'; *p = '\0';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment