From: Nguyễn Thái Ngọc Duy Date: Sat, 16 Aug 2014 03:08:03 +0000 (+0700) Subject: sha1_file.c: do not die failing to malloc in unpack_compressed_entry X-Git-Tag: v2.2.0-rc0~136^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=735efde838b68747e737e863427a4843a8efaddb;p=thirdparty%2Fgit.git sha1_file.c: do not die failing to malloc in unpack_compressed_entry Fewer die() gives better control to the caller, provided that the caller _can_ handle it. And in unpack_compressed_entry() case, it can, because unpack_compressed_entry() already returns NULL if it fails to inflate data. A side effect from this is fsck continues to run when very large blobs are present (and do not fit in memory). Noticed-by: Dale R. Worley Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/sha1_file.c b/sha1_file.c index 3f70b1d86a..8db73f0c53 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1923,7 +1923,9 @@ static void *unpack_compressed_entry(struct packed_git *p, git_zstream stream; unsigned char *buffer, *in; - buffer = xmallocz(size); + buffer = xmallocz_gently(size); + if (!buffer) + return NULL; memset(&stream, 0, sizeof(stream)); stream.next_out = buffer; stream.avail_out = size + 1; diff --git a/t/t1050-large.sh b/t/t1050-large.sh index aea493646e..5642f84b83 100755 --- a/t/t1050-large.sh +++ b/t/t1050-large.sh @@ -163,4 +163,10 @@ test_expect_success 'zip achiving, deflate' ' git archive --format=zip HEAD >/dev/null ' +test_expect_success 'fsck' ' + test_must_fail git fsck 2>err && + n=$(grep "error: attempting to allocate .* over limit" err | wc -l) && + test "$n" -gt 1 +' + test_done