mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/xread-in-full'

Browse Source 
A call to xread() was used without a loop around to cope with short
read in the codepath to stream new contents to a pack.

* js/xread-in-full:
  stream_to_pack: xread does not guarantee to read all requested bytes
This commit is contained in:
Junio C Hamano
2013-09-11 14:59:46 -07:00
parent 42e5fb2bf1 e92527c97c
commit 0a3bc7d298
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bulk-checkin.c
View File

@ -114,7 +114,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
if (size && !s.avail_in) { if (size && !s.avail_in) {
ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf); 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'", die("failed to read %d bytes from '%s'",
(int)rsize, path); (int)rsize, path);
offset += rsize; offset += rsize;