summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2011-08-31 12:48:46 +0800
committerJunio C Hamano <gitster@pobox.com>2011-08-31 10:03:51 -0700
commit2738bc3f09fa1baa3e664a6389394ca51e4fd376 (patch)
tree80a9b1f9ddc565ef995abe3710bee988b689b3e6 /xdiff
parent6486a84cb8e69ddf03b2139db3d968400e05f5b3 (diff)
downloadgit-2738bc3f09fa1baa3e664a6389394ca51e4fd376.tar.gz
xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
Ensure that the xdl_free_classifier() call on xdlclassifier_t cf is safe even if xdl_init_classifier() isn't called. This may occur in the case where diff is run with --histogram and a call to, say, xdl_prepare_ctx() fails. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xprepare.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 620fc9a657..5b676b7ca5 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -239,6 +239,8 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
long enl1, enl2, sample;
xdlclassifier_t cf;
+ memset(&cf, 0, sizeof(cf));
+
/*
* For histogram diff, we can afford a smaller sample size and
* thus a poorer estimate of the number of lines, as the hash