aboutsummaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsayjones.plus.com>2016-03-04 23:10:50 +0000
committerJunio C Hamano <gitster@pobox.com>2016-03-04 15:51:08 -0800
commit87f16258367a3b9a62663b11f898a4a6f3c19d31 (patch)
treebddc97adb9ea88ef2a5bfee29b172b087041e8cb /xdiff
parent5cd6978a9cfef58de061a9525f3678ade479564d (diff)
downloadgit-87f16258367a3b9a62663b11f898a4a6f3c19d31.tar.gz
git-87f16258367a3b9a62663b11f898a4a6f3c19d31.tar.xz
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 <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xprepare.c1
1 files changed, 1 insertions, 0 deletions
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;
}