diff options
| author | Jeff King <peff@peff.net> | 2016-02-22 17:44:25 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 14:51:09 -0800 |
| commit | b32fa95fd8293ebfecb2b7b6c8d460579318f9fe (patch) | |
| tree | 09af1e6cc980e672e7deefe4bc8f8844a25f14b2 /builtin/receive-pack.c | |
| parent | 850d2fec53ee188bab9e458f77906041ac7f1904 (diff) | |
| download | git-b32fa95fd8293ebfecb2b7b6c8d460579318f9fe.tar.gz | |
convert trivial cases to ALLOC_ARRAY
Each of these cases can be converted to use ALLOC_ARRAY or
REALLOC_ARRAY, which has two advantages:
1. It automatically checks the array-size multiplication
for overflow.
2. It always uses sizeof(*array) for the element-size,
so that it can never go out of sync with the declared
type of the array.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/receive-pack.c')
| -rw-r--r-- | builtin/receive-pack.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 932afab931..3dc3868c86 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1591,8 +1591,7 @@ static void prepare_shallow_update(struct command *commands, { int i, j, k, bitmap_size = (si->ref->nr + 31) / 32; - si->used_shallow = xmalloc(sizeof(*si->used_shallow) * - si->shallow->nr); + ALLOC_ARRAY(si->used_shallow, si->shallow->nr); assign_shallow_commits_to_refs(si, si->used_shallow, NULL); si->need_reachability_test = @@ -1658,7 +1657,7 @@ static void update_shallow_info(struct command *commands, return; } - ref_status = xmalloc(sizeof(*ref_status) * ref->nr); + ALLOC_ARRAY(ref_status, ref->nr); assign_shallow_commits_to_refs(si, NULL, ref_status); for (cmd = commands; cmd; cmd = cmd->next) { if (is_null_sha1(cmd->new_sha1)) |