user: remove static from idx vars, it causes crash after many iterati…

…ons of nsjail
google · Oct 16, 2017 · 64325b3 · 64325b3
1 parent 6a9cbc0
commit 64325b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/nsjail.c b/nsjail.c
@@ -101,8 +101,8 @@ static bool nsjailSetTimer(struct nsjconf_t* nsjconf)
 	}
 
 	struct itimerval it = {
-		.it_value = {.tv_sec = 1, .tv_usec = 0 },
-		.it_interval = {.tv_sec = 1, .tv_usec = 0 },
+		.it_value = { .tv_sec = 1, .tv_usec = 0 },
+		.it_interval = { .tv_sec = 1, .tv_usec = 0 },
 	};
 	if (setitimer(ITIMER_REAL, &it, NULL) == -1) {
 		PLOG_E("setitimer(ITIMER_REAL)");

diff --git a/user.c b/user.c
@@ -65,7 +65,7 @@ static bool userUidMapSelf(struct nsjconf_t* nsjconf, pid_t pid)
 	char fname[PATH_MAX];
 	snprintf(fname, sizeof(fname), "/proc/%d/uid_map", pid);
 
-	char map[4096] = {[0] = '\0' };
+	char map[4096] = { [0] = '\0' };
 
 	struct idmap_t* p;
 	TAILQ_FOREACH(p, &nsjconf->uids, pointers)
@@ -95,7 +95,7 @@ static bool userGidMapSelf(struct nsjconf_t* nsjconf, pid_t pid)
 	char fname[PATH_MAX];
 	snprintf(fname, sizeof(fname), "/proc/%d/gid_map", pid);
 
-	char map[4096] = {[0] = '\0' };
+	char map[4096] = { [0] = '\0' };
 
 	struct idmap_t* p;
 	TAILQ_FOREACH(p, &nsjconf->gids, pointers)
@@ -123,7 +123,7 @@ static bool userGidMapSelf(struct nsjconf_t* nsjconf, pid_t pid)
 /* Use /usr/bin/newgidmap for writing the gid map */
 static bool userGidMapExternal(struct nsjconf_t* nsjconf, pid_t pid UNUSED)
 {
-	static size_t idx = 0;
+	size_t idx = 0;
 
 	const char* argv[1024];
 	char parms[1024][256];
@@ -177,7 +177,7 @@ static bool userGidMapExternal(struct nsjconf_t* nsjconf, pid_t pid UNUSED)
 /* Use /usr/bin/newuidmap for writing the uid map */
 static bool userUidMapExternal(struct nsjconf_t* nsjconf, pid_t pid UNUSED)
 {
-	static size_t idx = 0;
+	size_t idx = 0;
 
 	const char* argv[1024];
 	char parms[1024][256];