Merge branch 'jc/calloc-fix'

[thirdparty/git.git] / builtin / receive-pack.c

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index b89ce31bf23104da3343c3b49c46b597bc117f66..17247269d2827cd589ebcfb97dd770efc2b61b56 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -2275,7 +2275,7 @@ static const char *unpack(int err_fd, struct shallow_info *si)
                status = start_command(&child);
                if (status)
                        return "index-pack fork failed";
-               pack_lockfile = index_pack_lockfile(child.out);
+               pack_lockfile = index_pack_lockfile(child.out, NULL);
                close(child.out);
                status = finish_command(&child);
                if (status)
@@ -2313,11 +2313,9 @@ static void prepare_shallow_update(struct shallow_info *si)
        ALLOC_ARRAY(si->used_shallow, si->shallow->nr);
        assign_shallow_commits_to_refs(si, si->used_shallow, NULL);
 
-       si->need_reachability_test =
-               xcalloc(si->shallow->nr, sizeof(*si->need_reachability_test));
-       si->reachable =
-               xcalloc(si->shallow->nr, sizeof(*si->reachable));
-       si->shallow_ref = xcalloc(si->ref->nr, sizeof(*si->shallow_ref));
+       CALLOC_ARRAY(si->need_reachability_test, si->shallow->nr);
+       CALLOC_ARRAY(si->reachable, si->shallow->nr);
+       CALLOC_ARRAY(si->shallow_ref, si->ref->nr);
 
        for (i = 0; i < si->nr_ours; i++)
                si->need_reachability_test[si->ours[i]] = 1;