Fix double "close()" in ce_compare_data

Linus Torvalds · Junio C Hamano · commit 7f8508e8d320 · 2006-07-31T11:55:56.000-07:00
Doing an "strace" on "git diff" shows that we close() a file descriptor
twice (getting EBADFD on the second one) when we end up in ce_compare_data
if the index does not match the checked-out stat information.

The "index_fd()" function will already have closed the fd for us, so we
should not close it again.

Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/read-cache.c b/read-cache.c
@@ -61,7 +61,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
 		unsigned char sha1[20];
 		if (!index_fd(sha1, fd, st, 0, NULL))
 			match = memcmp(sha1, ce->sha1, 20);
-		close(fd);
+		/* index_fd() closed the file descriptor already */
 	}
 	return match;
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static int ce_compare_data(struct cache_entry ce, struct stat st)`
`61`	`61`	`unsigned char sha1[20];`
`62`	`62`	`if (!index_fd(sha1, fd, st, 0, NULL))`
`63`	`63`	`match = memcmp(sha1, ce->sha1, 20);`
`64`		`- close(fd);`
	`64`	`+ /* index_fd() closed the file descriptor already */`
`65`	`65`	`}`
`66`	`66`	`return match;`
`67`	`67`	`}`