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 452323ca1268a345a67cec8008418a88c3018bb7..73c347d466074dd94d88b8c138dd3844f8040d19 100644 (file)
--- 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");