X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-file.c;h=3120a95f786eadd4cb5d167facc15714904e9665;hb=8146f19762c8fd67f6df3da4ba87a4e5ea880909;hp=2a939c9dd835a7e7946eb1548e4cf637ae3ca329;hpb=36a189c86e4a4ad75a75f598eedfe2defab3cbf3;p=git.git

diff --git a/merge-file.c b/merge-file.c
index 2a939c9dd..3120a95f7 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -61,6 +61,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	xdemitconf_t xecfg;
 	xdemitcb_t ecb;
 
+	memset(&xpp, 0, sizeof(xpp));
 	xpp.flags = XDF_NEED_MINIMAL;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;