xdiff/xprepare: fix a memory leak

ramsay-jones · gitster · commit 87f16258367a · 2016-03-04T15:51:08.000-08:00
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 &lt;ramsay@ramsayjones.plus.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,7 @@ int xdl_prepare_env(mmfile_t mf1, mmfile_t mf2, xpparam_t const *xpp,`
`301`	`301`
`302`	`302`	`xdl_free_ctx(&xe->xdf2);`
`303`	`303`	`xdl_free_ctx(&xe->xdf1);`
	`304`	`+ xdl_free_classifier(&cf);`
`304`	`305`	`return -1;`
`305`	`306`	`}`
`306`	`307`