From 5d491ef9daaa5c8245a991549b1860e9c29fef98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20Fran=C3=A7ois?= Date: Mon, 5 Aug 2013 23:16:00 +0200 Subject: [PATCH] Revert b10cba0e0af5b1e3e8cda0201d5563f085aab2a4 The length of the concatenated 2 lines was correct. --- ChangeLog | 5 +++++ lib/groupio.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b20387a..10509928 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-05 Nicolas François + + * lib/groupio.c: Revert change from 2013-07-29. The length of the + concatenated 2 lines was correct. + 2013-08-05 Nicolas François * libmisc/salt.c: random() max value is 2^31-1 (same as RAND_MAX diff --git a/lib/groupio.c b/lib/groupio.c index 137aaea6..2a37bfd9 100644 --- a/lib/groupio.c +++ b/lib/groupio.c @@ -329,7 +329,7 @@ static /*@null@*/struct commonio_entry *merge_group_entries ( } /* Concatenate the 2 lines */ - new_line_len = strlen (gr1->line) + strlen (gr2->line) +2; + new_line_len = strlen (gr1->line) + strlen (gr2->line) +1; new_line = (char *)malloc (new_line_len + 1); if (NULL == new_line) { errno = ENOMEM; -- 2.50.1