summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <carlosmn@github.com>2016-03-31 03:50:11 -0700
committerCarlos Martín Nieto <carlosmn@github.com>2016-03-31 03:50:11 -0700
commitbd4ef3373b02541bdd55b8e2ea803f4672681734 (patch)
treec738179a3528e8ec17e2a2183bb390e452b5f112
parent2f0450f4d635358f6da5d174c128b9ed1059bbf8 (diff)
parent6045afd39807b320013067858ed37adee9c0fc0d (diff)
downloadlibgit2-bd4ef3373b02541bdd55b8e2ea803f4672681734.tar.gz
Merge pull request #3715 from pks-t/pks/xprepare-memleak
xprepare memleaks
-rw-r--r--src/xdiff/xprepare.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xdiff/xprepare.c b/src/xdiff/xprepare.c
index 63a22c630..3183d50eb 100644
--- a/src/xdiff/xprepare.c
+++ b/src/xdiff/xprepare.c
@@ -301,10 +301,11 @@ 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;
}
- if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
+ if (XDF_DIFF_ALG((xpp->flags) & XDF_HISTOGRAM_DIFF))
xdl_free_classifier(&cf);
return 0;