Skip to content

Commit

Permalink
xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tay Ray Chuan authored and Junio C Hamano committed Aug 31, 2011
1 parent 6486a84 commit 2738bc3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions xdiff/xprepare.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2738bc3

Please sign in to comment.