Merge branch 'maint-2.6' into maint-2.7

diff --git a/notes.c b/notes.c
index db77922130b4f7df6ab72122206a76d6c580faac..8b59ccdb1166dfc413035e2699f3eb1dc9bd853e 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -1032,7 +1032,7 @@ struct notes_tree **load_notes_trees(struct string_list *refs)
        struct string_list_item *item;
        int counter = 0;
        struct notes_tree **trees;
-       trees = xmalloc((refs->nr+1) * sizeof(struct notes_tree *));
+       ALLOC_ARRAY(trees, refs->nr + 1);
        for_each_string_list_item(item, refs) {
                struct notes_tree *t = xcalloc(1, sizeof(struct notes_tree));
                init_notes(t, item->string, combine_notes_ignore, 0);