Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD

diff --git a/cache-tree.c b/cache-tree.c
index 20ee7b52df0c33d4473a198270705dffead01cdc..3ebf9c3aa44eb2ab25f573192b6449f63311ffd7 100644 (file)
--- 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,