]> git.neil.brown.name Git - edlib.git/commitdiff
wiggle: nul-terminate string from collect_merge()
authorNeilBrown <neil@brown.name>
Fri, 21 Jul 2023 04:45:43 +0000 (14:45 +1000)
committerNeilBrown <neil@brown.name>
Fri, 21 Jul 2023 04:45:43 +0000 (14:45 +1000)
I love untested code.

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

index a7a51723377b575d9ff6f7e02c8a87c8c8343dae..267ba53f0d48206277001928d21dda4423de5990 100644 (file)
@@ -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;
 }