summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2010-02-23 20:11:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-23 22:24:43 (GMT)
commit689b8c290db9d5880699dd3538134daffc1c55d0 (patch)
treea06aff089acd1adda1aeb34d1be2fd0f7cd1dcff /rerere.c
parent16758621d5a4a78eed7c183b60bf7ebaeaf305c5 (diff)
downloadgit-689b8c290db9d5880699dd3538134daffc1c55d0.zip
git-689b8c290db9d5880699dd3538134daffc1c55d0.tar.gz
git-689b8c290db9d5880699dd3538134daffc1c55d0.tar.bz2
rerere: fix memory leak if rerere images can't be read
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/rerere.c b/rerere.c
index d1d3e75..a59f74f 100644
--- a/rerere.c
+++ b/rerere.c
@@ -364,7 +364,7 @@ static int find_conflict(struct string_list *conflict)
static int merge(const char *name, const char *path)
{
int ret;
- mmfile_t cur, base, other;
+ mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
mmbuffer_t result = {NULL, 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")) ||
read_mmfile(&base, rerere_path(name, "preimage")) ||
- read_mmfile(&other, rerere_path(name, "postimage")))
- return 1;
+ read_mmfile(&other, rerere_path(name, "postimage"))) {
+ ret = 1;
+ goto out;
+ }
ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
if (!ret) {
FILE *f = fopen(path, "w");
@@ -387,6 +389,7 @@ static int merge(const char *name, const char *path)
strerror(errno));
}
+out:
free(cur.ptr);
free(base.ptr);
free(other.ptr);