From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Tue, 15 Nov 2016 15:05:44 +0000 (+0100)
Subject: snprintf() always terminates output with \0
X-Git-Tag: 4.5~31^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F48%2Fhead;p=thirdparty%2Fshadow.git

snprintf() always terminates output with \0
---

diff --git a/lib/groupio.c b/lib/groupio.c
index 3ad4736bb..ae2302b56 100644
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -338,8 +338,7 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 		errno = ENOMEM;
 		return NULL;
 	}
-	snprintf(new_line, new_line_len, "%s\n%s", gr1->line, gr2->line);
-	new_line[new_line_len] = '\0';
+	snprintf(new_line, new_line_len + 1, "%s\n%s", gr1->line, gr2->line);
 
 	/* Concatenate the 2 list of members */
 	for (i=0; NULL != gptr1->gr_mem[i]; i++);