undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: fix memory leak if rerere images can't be read

Browse Source 
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Bert Wesarg 2010-02-23 21:11:53 +01:00 committed by Junio C Hamano
parent 16758621d5
commit 689b8c290d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rerere.c
View File

@ -364,7 +364,7 @@ static int find_conflict(struct string_list *conflict)
static int merge(const char *name, const char *path) static int merge(const char *name, const char *path)
{ {
int ret; int ret;
mmfile_t cur, base, other; mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
mmbuffer_t result = {NULL, 0}; mmbuffer_t result = {NULL, 0};
if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0) if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
@ -372,8 +372,10 @@ static int merge(const char *name, const char *path)
if (read_mmfile(&cur, rerere_path(name, "thisimage")) || if (read_mmfile(&cur, rerere_path(name, "thisimage")) ||
read_mmfile(&base, rerere_path(name, "preimage")) || read_mmfile(&base, rerere_path(name, "preimage")) ||
read_mmfile(&other, rerere_path(name, "postimage"))) read_mmfile(&other, rerere_path(name, "postimage"))) {
return 1; ret = 1;
goto out;
}
ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0); ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
if (!ret) { if (!ret) {
FILE *f = fopen(path, "w"); FILE *f = fopen(path, "w");
@ -387,6 +389,7 @@ static int merge(const char *name, const char *path)
strerror(errno)); strerror(errno));
} }
out:
free(cur.ptr); free(cur.ptr);
free(base.ptr); free(base.ptr);
free(other.ptr); free(other.ptr);