From: Nguyễn Thái Ngọc Duy Date: Tue, 24 Jun 2014 11:45:34 GMT Subject: [PATCH v2 2/4] fsck: do not die when not enough memory to examine a pack entry Message-ID: <1403610336-27761-2-git-send-email-pclouds@gmail.com> In-Reply-To: <1403610336-27761-1-git-send-email-pclouds@gmail.com> fsck is a tool that error() is more preferred than die(), but many functions embed die() inside beyond fsck's control. unpack_compressed_entry()'s using xmallocz is such a function, triggered from verify_packfile() -> unpack_entry(). Make it use xmallocz_gentle() instead. Noticed-by: Dale R. Worley Signed-off-by: Nguyễn Thái Ngọc Duy --- sha1_file.c | 4 +++- t/t1050-large.sh | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index 34d527f..eb69c78 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1925,7 +1925,9 @@ static void *unpack_compressed_entry(struct packed_git *p, git_zstream stream; unsigned char *buffer, *in; - buffer = xmallocz(size); + buffer = xmallocz_gentle(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 aea4936..5642f84 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 -- 1.9.1.346.ga2b5940