aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-09 00:29:36 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-09 00:29:36 -0700
commitf4f78e668dd40f2d4a5bc119cccb3c34c2675c38 (patch)
tree087d0d3e360643fcc12cef76bdbbb1c60686803c /diff.c
parent8513c54b2a4a821336d10fae6e02db70f0876abc (diff)
parent802f9c9cb21321d3ffe7576e01bbe31c51bd4c70 (diff)
downloadgit-f4f78e668dd40f2d4a5bc119cccb3c34c2675c38.tar.gz
git-f4f78e668dd40f2d4a5bc119cccb3c34c2675c38.tar.xz
Merge branch 'maint'
* maint: diff.c: plug a memory leak in an error path fetch-pack: close output channel after sideband demultiplexer terminates builtin-remote: Make "remote show" display all urls
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 4d0a5b9ae..43835d756 100644
--- a/diff.c
+++ b/diff.c
@@ -3596,6 +3596,7 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
if (start_command(&child) != 0 ||
strbuf_read(&buf, child.out, 0) < 0 ||
finish_command(&child) != 0) {
+ strbuf_release(&buf);
remove_tempfile();
error("error running textconv command '%s'", pgm);
return NULL;