diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-08-16 10:08:03 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-08-18 10:15:19 -0700 |
| commit | 735efde838b68747e737e863427a4843a8efaddb (patch) | |
| tree | 4cef9ebadedd09e57441e0bcba740418e9ba5395 /sha1_file.c | |
| parent | wrapper.c: introduce gentle xmallocz that does not die() (diff) | |
| download | tgif-735efde838b68747e737e863427a4843a8efaddb.tar.xz | |
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 <worley@alum.mit.edu>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |