Browse Source

builtin/apply.c: fix a memleak

oldlines is allocated earlier in the function and also freed on the
successful code path.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 10 years ago committed by Junio C Hamano
parent
commit
f0b1f1ece7
  1. 4
      builtin/apply.c

4
builtin/apply.c

@ -2776,7 +2776,8 @@ static int apply_one_fragment(struct image *img, struct fragment *frag, @@ -2776,7 +2776,8 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
default:
if (apply_verbosely)
error(_("invalid start of line: '%c'"), first);
return -1;
applied_pos = -1;
goto out;
}
if (added_blank_line) {
if (!new_blank_lines_at_end)
@ -2915,6 +2916,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag, @@ -2915,6 +2916,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
(int)(old - oldlines), oldlines);
}

out:
free(oldlines);
strbuf_release(&newlines);
free(preimage.line_allocated);

Loading…
Cancel
Save