Initial all of 'End' merger.

This avoids invalid mem access when checking for ends_line at End.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/merge2.c b/merge2.c
index dc495afdf94d9c7b623ff54c81fb675b43f4f444..565181e1795c56803c6baf13269d1dccd3aaf2ec 100644 (file)
--- a/merge2.c
+++ b/merge2.c
@@ -446,6 +446,11 @@ struct ci make_merger(struct file af, struct file bf, struct file cf,
                        break;
        }
        rv.merger[i].type = End;
+       rv.merger[i].a = a;
+       rv.merger[i].b = b;
+       rv.merger[i].c = c;
+       rv.merger[i].c1 = c1;
+       rv.merger[i].c2 = c2;
        rv.merger[i].in_conflict = 0;
        assert(i < l);
        rv.conflicts = isolate_conflicts(af, bf, cf, csl1, csl2, words,