proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-05 20:35:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xdiff: fix memleak on error case

Browse Source 
Commit 3d1abc5afc fixes a memory leak in the xdiff code. In the
process of upstreaming the fix it was pointed out by Johannes
Schindelin that there is another memory leak present (see [1]).

Fix the second memory leak by applying the upstream fix to our
code base.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/287034
This commit is contained in:
Patrick Steinhardt 2016-03-01 08:54:00 +01:00
parent dbee683553
commit a4ea7faaad
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xdiff/xmerge.c
View File

@ -633,8 +633,11 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
result->ptr = NULL; result->ptr = NULL;
result->size = 0; result->size = 0;
if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0 || if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0) {
xdl_do_diff(orig, mf2, xpp, &xe2) < 0) { return -1;
}
if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0) {
xdl_free_env(&xe1);
return -1; return -1;
} }
if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 || if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 ||