Fixed BUFFER_SIZE_WARNING issues introduced by remote images code.

Signed-off-by: Rodrigo Bruno <rbruno@gsd.inesc-id.pt> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
checkpoint-restore · Jun 20, 2017 · 524fa5f · 524fa5f
1 parent 9c4921c
commit 524fa5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/criu/img-remote-proto.c b/criu/img-remote-proto.c
@@ -432,8 +432,10 @@ static struct rimage *new_remote_image(char *path, char *snapshot_id)
 		return NULL;
 	}
 
-	strncpy(rimg->path, path, PATHLEN);
-	strncpy(rimg->snapshot_id, snapshot_id, PATHLEN);
+	strncpy(rimg->path, path, PATHLEN -1 );
+	rimg->path[PATHLEN - 1] = '\0';
+	strncpy(rimg->snapshot_id, snapshot_id, PATHLEN - 1);
+	rimg->snapshot_id[PATHLEN - 1] = '\0';
 	rimg->size = 0;
 	buf->nbytes = 0;
 	INIT_LIST_HEAD(&(rimg->buf_head));

diff --git a/criu/img-remote.c b/criu/img-remote.c
@@ -39,7 +39,8 @@ struct snapshot *new_snapshot(char *snapshot_id)
 		pr_perror("Failed to allocate snapshot structure");
 		return NULL;
 	}
-	strncpy(s->snapshot_id, snapshot_id, PATHLEN);
+	strncpy(s->snapshot_id, snapshot_id, PATHLEN - 1);
+	s->snapshot_id[PATHLEN - 1]= '\0';
 	return s;
 }