diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:50:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:50:11 -0800 |
| commit | 2cd900fcf577af2cc5094ba21d1699809649f3bc (patch) | |
| tree | eec92d5e096ee2a2a5ee2352e1c276382552505b /xdiff-interface.c | |
| parent | d2559f734bba7fe5257720356a92f3b7a5b0d37c (diff) | |
| parent | 17367939ebd64f5e6eb4fa5a32ece513f497e6e6 (diff) | |
| download | git-2cd900fcf577af2cc5094ba21d1699809649f3bc.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.7.3.5
Fix false positives in t3404 due to SHELL=/bin/false
close file on error in read_mmfile()
Conflicts:
RelNotes
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index e1e054e4d9..164581f87f 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -212,8 +212,10 @@ int read_mmfile(mmfile_t *ptr, const char *filename) return error("Could not open %s", filename); sz = xsize_t(st.st_size); ptr->ptr = xmalloc(sz ? sz : 1); - if (sz && fread(ptr->ptr, sz, 1, f) != 1) + if (sz && fread(ptr->ptr, sz, 1, f) != 1) { + fclose(f); return error("Could not read %s", filename); + } fclose(f); ptr->size = sz; return 0; |