Merge branch 'maint-1.6.1' into maint-1.6.2

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 4f980aded6aa0f61b0a6354b0157b8711a2c4627..9ec5767709898af88d83256c6ea98d74863042d8 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3586,10 +3586,12 @@ 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) {
+               close(child.out);
                remove_tempfile();
                error("error running textconv command '%s'", pgm);
                return NULL;
        }
+       close(child.out);
        remove_tempfile();
 
        return strbuf_detach(&buf, outsize);