[PATCH] xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()

From: Tay Ray Chuan <rctay89@gmail.com>
Date: Aug 31, 2011, 04:48 UTC
Message-ID: <1314766126-5060-1-git-send-email-rctay89@gmail.com>

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>
---

This should go into 'rc/histogram-diff' in 'next'.

 xdiff/xprepare.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 620fc9a..4323596 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -239,6 +239,9 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 	long enl1, enl2, sample;
 	xdlclassifier_t cf;
 
+	cf.rchash = NULL;
+	cf.ncha.head = NULL;
+
 	/*
 	 * For histogram diff, we can afford a smaller sample size and
 	 * thus a poorer estimate of the number of lines, as the hash

-- 
1.7.6.1.706.gaa5cf