@matheusbsbs / matheus-bagliano / commits / 7f8508e8d3
Fork 0

Fix double "close()" in ce_compare_data

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 <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Jul 31, 2006 at 09:55 UTC 7f8508e8d320d768a34483682e9f2dc5af1af04b
1 file changed +1 -1
read-cache.c
+1 -1
@@ -61,7 +61,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
61 unsigned char sha1[20];
62 if (!index_fd(sha1, fd, st, 0, NULL))
63 match = memcmp(sha1, ce->sha1, 20);
64 - close(fd);
64 + /* index_fd() closed the file descriptor already */
65 }
66 return match;
67 }