From: Heikki Orsila <heikki.orsila@iki.fi>
Date: Sun, 27 Apr 2008 14:07:24 +0000 (+0300)
Subject: Die for an early EOF in a file reading loop
X-Git-Tag: v1.5.6-rc0~117
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0ec47b8e7f46e17e6b6fe1cead728fa24477e43;p=git.git

Die for an early EOF in a file reading loop

The resulting data is zero terminated after the read loop, but
the subsequent loop that scans for '\n' will overrun the buffer.

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/combine-diff.c b/combine-diff.c
index 0e19cbaac..f1e7a4d5d 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -718,9 +718,9 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			result = xmalloc(len + 1);
 			while (sz < len) {
 				ssize_t done = xread(fd, result+sz, len-sz);
-				if (done == 0)
-					break;
-				if (done < 0)
+				if (done == 0 && sz != len)
+					die("early EOF '%s'", elem->path);
+				else if (done < 0)
 					die("read error '%s'", elem->path);
 				sz += done;
 			}