Merge pull request #4201 from pks-t/pks/fileops-fd-leak

fileops: fix leaking fd in `mmap_ro_file`
This commit is contained in:
Edward Thomson 2017-04-12 09:21:26 +01:00 committed by GitHub
commit f9d3b0d05f

View File

@ -304,15 +304,19 @@ int git_futils_mmap_ro_file(git_map *out, const char *path)
if (fd < 0)
return fd;
if ((len = git_futils_filesize(fd)) < 0)
return -1;
if ((len = git_futils_filesize(fd)) < 0) {
result = -1;
goto out;
}
if (!git__is_sizet(len)) {
giterr_set(GITERR_OS, "file `%s` too large to mmap", path);
return -1;
result = -1;
goto out;
}
result = git_futils_mmap_ro(out, fd, 0, (size_t)len);
out:
p_close(fd);
return result;
}