Commit Diff

Commit:
505287bea16696d4be0e66f0d9c1db6eafea9fb6
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
properly handle duplicates when calling insert_ref()
Actions:
Patch | Tree
commit - 27a1ed032f37a6bf70d5bdabd452600125aa7d18
commit + 505287bea16696d4be0e66f0d9c1db6eafea9fb6
blob - a5ab53c09881abdd830f890c91ced4ca4bb61152
blob + b90b966fcf07c54227e67486dcda744d603bdc2e
--- lib/reference.c
+++ 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_r
 	}
 	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_r
 			/* 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, con
 			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
 	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
 	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
 			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;
 			}