From 72a30576da6f59f7d6ef9452bae78ec1ec4feea0 Mon Sep 17 00:00:00 2001
From: Niklas Eiling <niklas.eiling@rwth-aachen.de>
Date: Wed, 30 Mar 2016 23:28:43 +0200
Subject: [PATCH] use snprintf instead of strncat

Signed-off-by: Niklas Eiling <niklas.eiling@rwth-aachen.de>
---
 src/lxc/criu.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index aa874c722..52ac7b3b7 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -364,10 +364,13 @@ static void exec_criu(struct criu_opts *opts)
 
 	buf[0] = 0;
 	pos = 0;
+
 	for (i = 0; argv[i]; i++) {
-		strncat(buf, argv[i], sizeof(buf) - pos - 1);
-		strncat(buf, " ", sizeof(buf) - pos - 1);
-		pos += strlen(argv[i]);
+		ret = snprintf(buf + pos, sizeof(buf) - pos, "%s ", argv[i]);
+		if (ret < 0 || ret >= sizeof(buf) - pos)
+			goto err;
+		else
+			pos += ret;
 	}
 
 	INFO("execing: %s", buf);