stream_to_pack: xread does not guarantee to read all requested bytes
The deflate loop in bulk-checkin::stream_to_pack expects to get all bytes from a file that it requests to read in a single function call. But it used xread(), which does not give that guarantee. Replace it by read_in_full(). Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
15999998fb
commit
e92527c97c
@ -114,7 +114,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
|
||||
|
||||
if (size && !s.avail_in) {
|
||||
ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf);
|
||||
if (xread(fd, ibuf, rsize) != rsize)
|
||||
if (read_in_full(fd, ibuf, rsize) != rsize)
|
||||
die("failed to read %d bytes from '%s'",
|
||||
(int)rsize, path);
|
||||
offset += rsize;
|
||||
|
Loading…
Reference in New Issue
Block a user