summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorHeikki Orsila <heikki.orsila@iki.fi>2008-04-27 14:07:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-28 05:24:55 (GMT)
commitf0ec47b8e7f46e17e6b6fe1cead728fa24477e43 (patch)
treed17f61f540d66383f99d0520e188f40d51db097f /combine-diff.c
parente8729f5380788855943c69f749eb5e276c3b8310 (diff)
downloadgit-f0ec47b8e7f46e17e6b6fe1cead728fa24477e43.zip
git-f0ec47b8e7f46e17e6b6fe1cead728fa24477e43.tar.gz
git-f0ec47b8e7f46e17e6b6fe1cead728fa24477e43.tar.bz2
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>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 0e19cba..f1e7a4d 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;
}