Merge branch 'dl/merge-autostash-rebase-quit-fix'

[thirdparty/git.git] / walker.c

diff --git a/walker.c b/walker.c
index 6a579b230cae04af4db3d1ded4dfa6c5e32c4de9..4984bf8b3d6658dc2571f66bd5142e67c0fe7d37 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -272,12 +272,14 @@ int walker_fetch(struct walker *walker, int targets, char **target,
        struct strbuf refname = STRBUF_INIT;
        struct strbuf err = STRBUF_INIT;
        struct ref_transaction *transaction = NULL;
-       struct object_id *oids = xmalloc(targets * sizeof(struct object_id));
+       struct object_id *oids;
        char *msg = NULL;
        int i, ret = -1;
 
        save_commit_buffer = 0;
 
+       ALLOC_ARRAY(oids, targets);
+
        if (write_ref) {
                transaction = ref_transaction_begin(&err);
                if (!transaction) {