diff options
| author |  Jeff King <peff@peff.net> | 2013-03-25 16:16:50 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 13:46:47 -0700 |
| commit | 45d4bdae5906cfe6b7cb1ba1cec82fd80381e07e (patch) | |
| tree | 1ff97a633a56df704998bdc7ec41c15ee18e05fa | |
| parent | Second wave of topics toward 1.8.3 (diff) | |
| download | tgif-45d4bdae5906cfe6b7cb1ba1cec82fd80381e07e.tar.xz | |
stream_blob_to_fd: detect errors reading from stream
We call read_istream, but never check its return value for
errors. This can lead to us looping infinitely, as we just
keep trying to write "-1" bytes (and we do not notice the
error, as we simply check that write_in_full reports the
same number of bytes we fed it, which of course is also -1).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | streaming.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/streaming.c b/streaming.c index 4d978e54e4..f4126a7da5 100644 --- a/streaming.c +++ b/streaming.c @@ -514,6 +514,8 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f ssize_t wrote, holeto; ssize_t readlen = read_istream(st, buf, sizeof(buf)); + if (readlen < 0) + goto close_and_exit; if (!readlen) break; if (can_seek && sizeof(buf) == readlen) { |