commit 9ccd0a88ac3ea13ac2df4630bfd01c02084f965e
author Brian Downing <bdowning@lavos.net> Sat Oct 25 15:30:37 2008 +0200
committer Junio C Hamano <gitster@pobox.com> Sat Oct 25 12:09:31 2008 -0700
tree 311e998623a98265b07aee45a17f22b486678674
parent 7c4ed8c83583517e7e6d851c8c01996ca6c803ff

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>

combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 5aa1104..ec8df39 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -213,6 +213,7 @@
 
 	parent_file.ptr = grab_blob(parent, &sz);
 	parent_file.size = sz;
+	memset(&xpp, 0, sizeof(xpp));
 	xpp.flags = XDF_NEED_MINIMAL;
 	memset(&xecfg, 0, sizeof(xecfg));
 	memset(&state, 0, sizeof(state));