From: S.Çağlar Onur <caglar@10ur.org>
Date: Fri, 15 Nov 2013 04:03:58 +0000 (-0500)
Subject: fix memory leaks reported by cppcheck in src/lxc/bdev.c
X-Git-Tag: lxc-1.0.0.beta1~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9529609a815cb7e62687ddf4c90c04858764a2e4;p=thirdparty%2Flxc.git

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

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index c7e5e5ee3..6acd29a68 100644
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -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
 	// cannot specify a size that's different from the original size.
 	ret = lvm_is_thin_volume(orig);
-	if (ret == -1)
+	if (ret == -1) {
+		free(pathdup);
 		return -1;
+	}
 
 	if (!ret) {
 		ret = execlp("lvcreate", "lvcreate", "-s", "-L", sz, "-n", lv, orig, (char *)NULL);
@@ -1282,6 +1284,7 @@ static int btrfs_subvolume_create(const char *path)
 	p = strrchr(newfull, '/');
 	if (!p) {
 		ERROR("bad path: %s", path);
+		free(newfull);
 		return -1;
 	}
 	*p = '\0';
@@ -1418,6 +1421,7 @@ static int btrfs_destroy(struct bdev *orig)
 	p = strrchr(newfull, '/');
 	if (!p) {
 		ERROR("bad path: %s", path);
+		free(newfull);
 		return -1;
 	}
 	*p = '\0';