sha1-file: close fd of empty file in map_sha1_file_1()
authorRené Scharfe <l.s.r@web.de>
Mon, 7 Jan 2019 16:48:02 +0000 (17:48 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2019 16:57:18 +0000 (08:57 -0800)
map_sha1_file_1() checks if the file it is about to mmap() is empty and
errors out in that case and explains the situation in an error message.
It leaks the private handle to that empty file, though.

Have the function clean up after itself and close the file descriptor
before exiting early.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sha1-file.c
index 5bd11c85bc563618b59dad3ff06e5ae5296c892b..fb098c7a17a5b020a9f9b6220e8226a0537c28bc 100644 (file)
@@ -971,6 +971,7 @@ static void *map_sha1_file_1(struct repository *r, const char *path,
                        if (!*size) {
                                /* mmap() is forbidden on empty files */
                                error(_("object file %s is empty"), path);
+                               close(fd);
                                return NULL;
                        }
                        map = xmmap(NULL, *size, PROT_READ, MAP_PRIVATE, fd, 0);