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 /line-log.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 'line-log.c')
| -rw-r--r-- | line-log.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/line-log.c b/line-log.c index 5877986c5a..bbe31ed6fb 100644 --- a/line-log.c +++ b/line-log.c @@ -522,7 +522,7 @@ static void fill_line_ends(struct diff_filespec *spec, long *lines, if (diff_populate_filespec(spec, 0)) die("Cannot read blob %s", sha1_to_hex(spec->sha1)); - ends = xmalloc(size * sizeof(*ends)); + ALLOC_ARRAY(ends, size); ends[cur++] = 0; data = spec->data; while (num < spec->size) { @@ -1142,9 +1142,9 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm if (nparents > 1 && rev->first_parent_only) nparents = 1; - diffqueues = xmalloc(nparents * sizeof(*diffqueues)); - cand = xmalloc(nparents * sizeof(*cand)); - parents = xmalloc(nparents * sizeof(*parents)); + ALLOC_ARRAY(diffqueues, nparents); + ALLOC_ARRAY(cand, nparents); + ALLOC_ARRAY(parents, nparents); p = commit->parents; for (i = 0; i < nparents; i++) { |