diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:37:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:37:16 (GMT) |
| commit | 11529ecec914d2f0d7575e6d443c2d5a6ff75424 (patch) | |
| tree | f91bf9915ab0499913b8ee0e941a642183b7da67 /pack-revindex.c | |
| parent | 3ed26a44b3415f5761bdab21f823d964c20a2824 (diff) | |
| parent | 08c95df8faa25ab4c9ad3da45bc12abb9274d343 (diff) | |
| download | git-11529ecec914d2f0d7575e6d443c2d5a6ff75424.zip git-11529ecec914d2f0d7575e6d443c2d5a6ff75424.tar.gz git-11529ecec914d2f0d7575e6d443c2d5a6ff75424.tar.bz2 | |
Merge branch 'jk/tighten-alloc'
Update various codepaths to avoid manually-counted malloc().
* jk/tighten-alloc: (22 commits)
ewah: convert to REALLOC_ARRAY, etc
convert ewah/bitmap code to use xmalloc
diff_populate_gitlink: use a strbuf
transport_anonymize_url: use xstrfmt
git-compat-util: drop mempcpy compat code
sequencer: simplify memory allocation of get_message
test-path-utils: fix normalize_path_copy output buffer size
fetch-pack: simplify add_sought_entry
fast-import: simplify allocation in start_packfile
write_untracked_extension: use FLEX_ALLOC helper
prepare_{git,shell}_cmd: use argv_array
use st_add and st_mult for allocation size computation
convert trivial cases to FLEX_ARRAY macros
use xmallocz to avoid size arithmetic
convert trivial cases to ALLOC_ARRAY
convert manual allocations to argv_array
argv-array: add detach function
add helpers for allocating flex-array structs
harden REALLOC_ARRAY and xcalloc against size_t overflow
tree-diff: catch integer overflow in combine_diff_path allocation
...
Diffstat (limited to 'pack-revindex.c')
| -rw-r--r-- | pack-revindex.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pack-revindex.c b/pack-revindex.c index 155a8a3..96d51c3 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -44,10 +44,14 @@ static void sort_revindex(struct revindex_entry *entries, unsigned n, off_t max) * keep track of them with alias pointers, always sorting from "from" * to "to". */ - struct revindex_entry *tmp = xmalloc(n * sizeof(*tmp)); - struct revindex_entry *from = entries, *to = tmp; + struct revindex_entry *tmp, *from, *to; int bits; - unsigned *pos = xmalloc(BUCKETS * sizeof(*pos)); + unsigned *pos; + + ALLOC_ARRAY(pos, BUCKETS); + ALLOC_ARRAY(tmp, n); + from = entries; + to = tmp; /* * If (max >> bits) is zero, then we know that the radix digit we are @@ -121,7 +125,7 @@ static void create_pack_revindex(struct packed_git *p) unsigned i; const char *index = p->index_data; - p->revindex = xmalloc(sizeof(*p->revindex) * (num_ent + 1)); + ALLOC_ARRAY(p->revindex, num_ent + 1); index += 4 * 256; if (p->index_version > 1) { |