Merge branch 'js/xread-in-full' into maint

* js/xread-in-full: stream_to_pack: xread does not guarantee to read all requested bytes
git-mirror · Sep 26, 2013 · be5e850 · be5e850
2 parents 31d757d + e92527c
commit be5e850
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bulk-checkin.c b/bulk-checkin.c
@@ -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;