Commit Diff

Commit:
3039b005314e94c1558771544b2064a1a10507fd
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
fix infinite loop in got_pack_repaint_parent_commits() This can be observed during 'got send' or 'gotadmin pack/cleanup' in some cases. We would keep processing the same parent commits over and over.
Actions:
Patch | Tree
commit - 80cc5d989e029dd9ed36f4faa993eb53e0a227af
commit + 3039b005314e94c1558771544b2064a1a10507fd
blob - 9344a08b911bee2ed4f078b667d76dcfedc24c16
blob + fee8a73d38d4fafb28836c33a30c6167d61cdc30
--- lib/pack_create.c
+++ lib/pack_create.c
@@ -1050,14 +1050,19 @@ got_pack_repaint_parent_commits(struct got_object_id *
     struct got_object_idset *set, struct got_object_idset *skip,
     struct got_repository *repo)
 {
-	const struct got_error *err;
+	const struct got_error *err = NULL;
 	struct got_object_id_queue ids;
-	struct got_object_qid *qid;
-	struct got_commit_object *commit;
+	struct got_object_qid *qid = NULL;
+	struct got_commit_object *commit = NULL;
 	const struct got_object_id_queue *parents;
+	struct got_object_idset *traversed;
 
 	STAILQ_INIT(&ids);
 
+	traversed = got_object_idset_alloc();
+	if (traversed == NULL)
+		return got_error_from_errno("got_object_idset_alloc");
+
 	err = got_object_open_as_commit(&commit, repo, commit_id);
 	if (err)
 		return err;
@@ -1078,10 +1083,17 @@ got_pack_repaint_parent_commits(struct got_object_id *
 				    got_object_idset_contains(skip, &pid->id))
 					continue;
 
+				if (got_object_idset_contains(traversed,
+				    &pid->id))
+					continue;
 				err = got_pack_queue_commit_id(&ids, &pid->id,
 				    color, repo);
 				if (err)
 					break;
+				err = got_object_idset_add(traversed,
+				    &pid->id, NULL);
+				if (err)
+					goto done;
 			}
 		}
 		got_object_commit_close(commit);
@@ -1103,12 +1115,13 @@ got_pack_repaint_parent_commits(struct got_object_id *
 		got_object_qid_free(qid);
 		qid = NULL;
 	}
-
+done:
 	if (commit)
 		got_object_commit_close(commit);
 	if (qid)
 		got_object_qid_free(qid);
 	got_object_id_queue_free(&ids);
+	got_object_idset_free(traversed);
 
 	return err;
 }