diff options
| author | Heikki Orsila <heikki.orsila@iki.fi> | 2008-04-27 17:07:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-27 22:24:55 -0700 |
| commit | f0ec47b8e7f46e17e6b6fe1cead728fa24477e43 (patch) | |
| tree | d17f61f540d66383f99d0520e188f40d51db097f /combine-diff.c | |
| parent | e8729f5380788855943c69f749eb5e276c3b8310 (diff) | |
| download | git-f0ec47b8e7f46e17e6b6fe1cead728fa24477e43.tar.gz | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c index 0e19cbaacc..f1e7a4d5d9 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; } |