diff options
| author | Jeff King <peff@peff.net> | 2016-02-22 22:44:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 22:51:09 (GMT) |
| commit | 96ffc06f72f693d80f05059a1f0e5ca9007d5f1b (patch) | |
| tree | 8f4587b3132a422757280f3d4f7bc302230efd7c /cache-tree.c | |
| parent | 3733e6946465d4a3a1d89026a5ec911d3af339ab (diff) | |
| download | git-96ffc06f72f693d80f05059a1f0e5ca9007d5f1b.zip git-96ffc06f72f693d80f05059a1f0e5ca9007d5f1b.tar.gz git-96ffc06f72f693d80f05059a1f0e5ca9007d5f1b.tar.bz2 | |
convert trivial cases to FLEX_ARRAY macros
Using FLEX_ARRAY macros reduces the amount of manual
computation size we have to do. It also ensures we don't
overflow size_t, and it makes sure we write the same number
of bytes that we allocated.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cache-tree.c b/cache-tree.c index a59e6f1..1fbe79a 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -79,11 +79,9 @@ static struct cache_tree_sub *find_subtree(struct cache_tree *it, ALLOC_GROW(it->down, it->subtree_nr + 1, it->subtree_alloc); it->subtree_nr++; - down = xmalloc(sizeof(*down) + pathlen + 1); + FLEX_ALLOC_MEM(down, name, path, pathlen); down->cache_tree = NULL; down->namelen = pathlen; - memcpy(down->name, path, pathlen); - down->name[pathlen] = 0; if (pos < it->subtree_nr) memmove(it->down + pos + 1, |