From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 14 Dec 2017 13:15:18 +0000 (+0100)
Subject: conf: simplify run_script_argv()
X-Git-Tag: lxc-3.0.0.beta1~111^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d08e57088e479dec028a57b919663c0e99e58c8a;p=thirdparty%2Flxc.git

conf: simplify run_script_argv()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 54b55acda..93d4d09f5 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -345,7 +345,7 @@ int run_script_argv(const char *name, unsigned int hook_version,
 {
 	int buf_pos, i, ret;
 	char *buffer;
-	size_t size = 0, size_legacy_args = 0;
+	size_t size = 0;
 
 	if (hook_version == 0)
 		INFO("Executing script \"%s\" for container \"%s\", config "
@@ -360,22 +360,23 @@ int run_script_argv(const char *name, unsigned int hook_version,
 	size += strlen(script);
 	size++;
 
-	size_legacy_args += strlen(section);
-	size_legacy_args++;
-
-	size_legacy_args += strlen(name);
-	size_legacy_args++;
-
-	size_legacy_args += strlen(hookname);
-	size_legacy_args++;
-
 	if (size > INT_MAX)
 		return -EFBIG;
 
 	buffer = alloca(size);
 
 	if (hook_version == 0) {
-		size += size_legacy_args;
+		size += strlen(hookname);
+		size++;
+
+		size += strlen(name);
+		size++;
+
+		size += strlen(section);
+		size++;
+
+		if (size > INT_MAX)
+			return -EFBIG;
 
 		buf_pos = snprintf(buffer, size, "exec %s %s %s %s", script, name, section, hookname);
 		if (buf_pos < 0 || (size_t)buf_pos >= size) {