From: Dwight Engen <dwight.engen@oracle.com>
Date: Fri, 3 May 2013 15:29:39 +0000 (-0400)
Subject: coverity: ensure string is null terminated, return in
X-Git-Tag: lxc-1.0.0.alpha1~1^2~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2eea3c1974d70bdef74a0af6a14ca3a6fa41704;p=thirdparty%2Flxc.git

coverity: ensure string is null terminated, return in

 error case

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 452323ca1..73c347d46 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1160,10 +1160,11 @@ static int update_name_and_paths(const char *path, struct lxc_container *oldc,
 		SYSERROR("rewinding old config");
 		return -1;
 	}
-	contents = malloc(flen);
+	contents = malloc(flen+1);
 	if (!contents) {
 		SYSERROR("out of memory");
 		fclose(f);
+		return -1;
 	}
 	if (fread(contents, 1, flen, f) != flen) {
 		free(contents);
@@ -1171,6 +1172,7 @@ static int update_name_and_paths(const char *path, struct lxc_container *oldc,
 		SYSERROR("reading old config");
 		return -1;
 	}
+	contents[flen] = '\0';
 	if (fclose(f) < 0) {
 		free(contents);
 		SYSERROR("closing old config");