From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 9 Jun 2012 21:05:23 +0000 (+0200)
Subject: blkid: fix realloc memory leak [cppcheck]
X-Git-Tag: v2.22-rc1~277^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41420120a865186a1cbd97f01aea00c809d6b6ba;p=thirdparty%2Futil-linux.git

blkid: fix realloc memory leak [cppcheck]

[misc-utils/blkid.c:367]: (error) Common realloc mistake: 'str' nulled but not freed upon failure

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 25e6c00e8e..840cfe4f62 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -365,8 +365,10 @@ static int append_str(char **res, size_t *sz, const char *a, const char *b)
 		return -1;
 
 	str = realloc(str, len + 1);
-	if (!str)
+	if (!str) {
+		free(*res);
 		return -1;
+	}
 
 	*res = str;
 	str += *sz;