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>
This commit is contained in:
committed by
Junio C Hamano
parent
850d2fec53
commit
b32fa95fd8
@ -52,7 +52,7 @@ static void prepare_order(const char *orderfile)
|
||||
}
|
||||
if (pass == 0) {
|
||||
order_cnt = cnt;
|
||||
order = xmalloc(sizeof(*order) * cnt);
|
||||
ALLOC_ARRAY(order, cnt);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -120,7 +120,7 @@ void diffcore_order(const char *orderfile)
|
||||
if (!q->nr)
|
||||
return;
|
||||
|
||||
o = xmalloc(sizeof(*o) * q->nr);
|
||||
ALLOC_ARRAY(o, q->nr);
|
||||
for (i = 0; i < q->nr; i++)
|
||||
o[i].obj = q->queue[i];
|
||||
order_objects(orderfile, pair_pathtwo, o, q->nr);
|
||||
|
||||
Reference in New Issue
Block a user