summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorBrian Downing <bdowning@lavos.net>2008-10-25 13:30:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-25 19:09:31 (GMT)
commit9ccd0a88ac3ea13ac2df4630bfd01c02084f965e (patch)
tree311e998623a98265b07aee45a17f22b486678674 /merge-file.c
parent7c4ed8c83583517e7e6d851c8c01996ca6c803ff (diff)
downloadgit-9ccd0a88ac3ea13ac2df4630bfd01c02084f965e.zip
git-9ccd0a88ac3ea13ac2df4630bfd01c02084f965e.tar.gz
git-9ccd0a88ac3ea13ac2df4630bfd01c02084f965e.tar.bz2
Always initialize xpparam_t to 0
We're going to be adding some parameters to this, so we can't have any uninitialized data in it. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
-rw-r--r--merge-file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-file.c b/merge-file.c
index 2a939c9..3120a95 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;