From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 6 Oct 2008 17:28:41 +0000 (+0200)
Subject: Do not use errno when pread() returns 0
X-Git-Tag: v1.6.0.3~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb7424363643d6049faf3bda399e5e602782b5b7;p=git.git

Do not use errno when pread() returns 0

If we use pread() while at the end of the file, it will return 0, which is
not an error from the operating system point of view. In this case, errno
has not been set and must not be used.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/index-pack.c b/index-pack.c
index 530d82037..c45ae20e8 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -365,8 +365,11 @@ static void *get_data_from_pack(struct object_entry *obj)
 	data = src;
 	do {
 		ssize_t n = pread(pack_fd, data + rdy, len - rdy, from + rdy);
-		if (n <= 0)
+		if (n < 0)
 			die("cannot pread pack file: %s", strerror(errno));
+		if (!n)
+			die("premature end of pack file, %lu bytes missing",
+			    len - rdy);
 		rdy += n;
 	} while (rdy < len);
 	data = xmalloc(obj->size);