Revert b10cba0e0af5b1e3e8cda0201d5563f085aab2a4

The length of the concatenated 2 lines was correct.

diff --git a/ChangeLog b/ChangeLog
index 0b20387a81257c2a2f69dc8f024bb4fae335ec49..105099288afd04fe066b01453ab2fb59c1818a3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-05  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * lib/groupio.c: Revert change from 2013-07-29. The length of the
+       concatenated 2 lines was correct.
+
 2013-08-05  Nicolas François  <nicolas.francois@centraliens.net>
 
        * 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 137aaea6f3a198c2d6505543c5e8de2f68e104f1..2a37bfd9ae37690c0deb00d2db7a62a880e32bf3 100644 (file)
--- 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;