Skip to content

Commit 0afbe3e

Browse files
peffgitster
authored andcommitted
read_istream_pack_non_delta(): document input handling
Twice now we have scratched our heads about why the loose streaming code needs the protection added by 692f0bc (avoid infinite loop in read_istream_loose, 2013-03-25), but the similar code in its pack counterpart does not. The short answer is that use_pack() will die before it lets us run out of bytes. Note that this could mean reading garbage (including the trailing hash) from the packfile in some cases of corruption, but that's OK. zlib will notice and complain (and if not, certainly the end result will not match the object hash we expect). Let's leave a comment this time to document our findings. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cae598d commit 0afbe3e

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

streaming.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,15 @@ static read_method_decl(pack_non_delta)
408408
st->z_state = z_done;
409409
break;
410410
}
411+
412+
/*
413+
* Unlike the loose object case, we do not have to worry here
414+
* about running out of input bytes and spinning infinitely. If
415+
* we get Z_BUF_ERROR due to too few input bytes, then we'll
416+
* replenish them in the next use_pack() call when we loop. If
417+
* we truly hit the end of the pack (i.e., because it's corrupt
418+
* or truncated), then use_pack() catches that and will die().
419+
*/
411420
if (status != Z_OK && status != Z_BUF_ERROR) {
412421
git_inflate_end(&st->z);
413422
st->z_state = z_error;

0 commit comments

Comments
 (0)