kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/maint-diff-fd-leak' into maint 

* rs/maint-diff-fd-leak:
  close file on error in read_mmfile()
maint
Junio C Hamano 2010-12-26 11:18:39 -08:00
parent c2ed29b49b 5fd898141c
commit 26517dea24
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xdiff-interface.c
View File

@ -212,8 +212,10 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
return error("Could not open %s", filename); return error("Could not open %s", filename);
sz = xsize_t(st.st_size); sz = xsize_t(st.st_size);
ptr->ptr = xmalloc(sz ? sz : 1); 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); return error("Could not read %s", filename);
}
fclose(f); fclose(f);
ptr->size = sz; ptr->size = sz;
return 0; return 0;