From: NeilBrown <neil@brown.name>
Date: Fri, 21 Jul 2023 04:45:43 +0000 (+1000)
Subject: wiggle: nul-terminate string from collect_merge()
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=7c408272529cc249b72c885547e1183efd3601f7;p=edlib.git

wiggle: nul-terminate string from collect_merge()

I love untested code.

Signed-off-by: NeilBrown <neil@brown.name>
---

diff --git a/lib-wiggle.c b/lib-wiggle.c
index a7a51723..267ba53f 100644
--- a/lib-wiggle.c
+++ b/lib-wiggle.c
@@ -546,6 +546,7 @@ static char *collect_merge(struct merge *merge safe,
 		else if (m->type == Changed)
 			l += copy_words(str+l, &af, m->c, m->cl);
 	}
+	str[l] = 0;
 	return str;
 }