]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/detect-truncated-zlib-input'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:17 +0000 (22:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:17 +0000 (22:37 +0900)
A regression in Git 2.12 era made "git fsck" fall into an infinite
loop while processing truncated loose objects.

* jk/detect-truncated-zlib-input:
  cat-file: handle streaming failures consistently
  check_stream_sha1(): handle input underflow
  t1450: check large blob in trailing-garbage test

1  2 
builtin/cat-file.c
sha1-file.c

Simple merge
diff --cc sha1-file.c
Simple merge