Merge branch 'jk/bug-to-abort' into maint

diff --git a/patch-ids.c b/patch-ids.c
index fa8f11de82657c3edf4e5c0869d76ae6f12b57bb..92eba7a059e89873e2d94fd5ee37a92b887bde4c 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -99,11 +99,12 @@ struct patch_id *has_commit_patch_id(struct commit *commit,
 struct patch_id *add_commit_patch_id(struct commit *commit,
                                     struct patch_ids *ids)
 {
-       struct patch_id *key = xcalloc(1, sizeof(*key));
+       struct patch_id *key;
 
        if (!patch_id_defined(commit))
                return NULL;
 
+       key = xcalloc(1, sizeof(*key));
        if (init_patch_id_entry(key, commit, ids)) {
                free(key);
                return NULL;