Merge branch 'rs/sha1-file-close-mapped-file-on-error'

gitster · gitster · commit 2c0a645d9e1f · 2019-01-18T13:49:56.000-08:00
Code clean-up.

* rs/sha1-file-close-mapped-file-on-error:
  sha1-file: close fd of empty file in map_sha1_file_1()
diff --git a/sha1-file.c b/sha1-file.c
@@ -960,6 +960,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);

Original file line number	Diff line number	Diff line change
`@@ -960,6 +960,7 @@ static void map_sha1_file_1(struct repository r, const char *path,`
`960`	`960`	`if (!*size) {`
`961`	`961`	`/* mmap() is forbidden on empty files */`
`962`	`962`	`error(_("object file %s is empty"), path);`
	`963`	`+ close(fd);`
`963`	`964`	`return NULL;`
`964`	`965`	`}`
`965`	`966`	`map = xmmap(NULL, *size, PROT_READ, MAP_PRIVATE, fd, 0);`