From 87f16258367a3b9a62663b11f898a4a6f3c19d31 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Fri, 4 Mar 2016 23:10:50 +0000 Subject: [PATCH] xdiff/xprepare: fix a memory leak The xdl_prepare_env() function may initialise an xdlclassifier_t data structure via xdl_init_classifier(), which allocates memory to several fields, for example 'rchash', 'rcrecs' and 'ncha'. If this function later exits due to the failure of xdl_optimize_ctxs(), then this xdlclassifier_t structure, and the memory allocated to it, is not cleaned up. In order to fix the memory leak, insert a call to xdl_free_classifier() before returning. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- xdiff/xprepare.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 5ffcf996f..13b55aba7 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -301,6 +301,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdl_free_ctx(&xe->xdf2); xdl_free_ctx(&xe->xdf1); + xdl_free_classifier(&cf); return -1; }