diff options
| author |  Jeff King <peff@peff.net> | 2013-03-25 16:17:17 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 13:46:55 -0700 |
| commit | f54fac53786808130c82936e59be16000deba04a (patch) | |
| tree | 6c6d2b4f63c493bc903831ade124d1b5dc2038e1 /sha1_file.c | |
| parent | stream_blob_to_fd: detect errors reading from stream (diff) | |
| download | tgif-f54fac53786808130c82936e59be16000deba04a.tar.xz | |
check_sha1_signature: check return value from read_istream
It's possible for read_istream to return an error, in which
case we just end up in an infinite loop (aside from EOF, we
do not even look at the result, but just feed it straight
into our running hash).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index 16967d3b9a..0b99f336e6 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1266,6 +1266,10 @@ int check_sha1_signature(const unsigned char *sha1, void *map, char buf[1024 * 16]; ssize_t readlen = read_istream(st, buf, sizeof(buf)); + if (readlen < 0) { + close_istream(st); + return -1; + } if (!readlen) break; git_SHA1_Update(&c, buf, readlen); |