Commit 505287bea16696d4be0e66f0d9c1db6eafea9fb6
2019-03-15T13:06:47
properly handle duplicates when calling insert_ref()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/lib/reference.c b/lib/reference.c
index a5ab53c..b90b966 100644
--- a/lib/reference.c
+++ b/lib/reference.c
@@ -545,14 +545,16 @@ got_ref_get_name(struct got_reference *ref)
}
static const struct got_error *
-insert_ref(struct got_reflist_head *refs, struct got_reference *ref,
- struct got_repository *repo)
+insert_ref(struct got_reflist_entry **newp, struct got_reflist_head *refs,
+ struct got_reference *ref, struct got_repository *repo)
{
const struct got_error *err;
struct got_object_id *id;
struct got_reflist_entry *new, *re, *prev;
int cmp;
+ *newp = NULL;
+
err = got_ref_resolve(&id, repo, ref);
if (err)
return err;
@@ -564,6 +566,7 @@ insert_ref(struct got_reflist_head *refs, struct got_reference *ref,
}
new->ref = ref;
new->id = id;
+ *newp = new;
/*
* We must de-duplicate entries on insert because packed-refs may
@@ -579,6 +582,7 @@ insert_ref(struct got_reflist_head *refs, struct got_reference *ref,
/* duplicate */
free(new->id);
free(new);
+ *newp = NULL;
return NULL;
} else if (cmp > 0) {
if (prev)
@@ -630,7 +634,10 @@ gather_on_disk_refs(struct got_reflist_head *refs, const char *path_refs,
if (err)
goto done;
if (ref) {
- err = insert_ref(refs, ref, repo);
+ struct got_reflist_entry *new;
+ err = insert_ref(&new, refs, ref, repo);
+ if (err || new == NULL /* duplicate */)
+ got_ref_close(ref);
if (err)
goto done;
}
@@ -662,6 +669,7 @@ got_ref_list(struct got_reflist_head *refs, struct got_repository *repo)
char *packed_refs_path, *path_refs = NULL;
FILE *f = NULL;
struct got_reference *ref;
+ struct got_reflist_entry *new;
/* HEAD ref should always exist. */
path_refs = get_refs_dir_path(repo, GOT_REF_HEAD);
@@ -672,7 +680,9 @@ got_ref_list(struct got_reflist_head *refs, struct got_repository *repo)
err = open_ref(&ref, path_refs, "", GOT_REF_HEAD);
if (err)
goto done;
- err = insert_ref(refs, ref, repo);
+ err = insert_ref(&new, refs, ref, repo);
+ if (err || new == NULL /* duplicate */)
+ got_ref_close(ref);
if (err)
goto done;
@@ -716,7 +726,9 @@ got_ref_list(struct got_reflist_head *refs, struct got_repository *repo)
if (err)
goto done;
if (ref) {
- err = insert_ref(refs, ref, repo);
+ err = insert_ref(&new, refs, ref, repo);
+ if (err || new == NULL /* duplicate */)
+ got_ref_close(ref);
if (err)
goto done;
}