Commit 22220781541b833f3c7800592a6a4ed37dd18e1b
2020-01-04T18:36:07
simplify error handling in got_commit_graph_open()
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
diff --git a/lib/commit_graph.c b/lib/commit_graph.c
index 93faeeb..fe7db47 100644
--- a/lib/commit_graph.c
+++ b/lib/commit_graph.c
@@ -347,7 +347,7 @@ const struct got_error *
got_commit_graph_open(struct got_commit_graph **graph,
const char *path, int first_parent_traversal)
{
- const struct got_error *err;
+ const struct got_error *err = NULL;
*graph = calloc(1, sizeof(**graph));
if (*graph == NULL)
@@ -356,35 +356,30 @@ got_commit_graph_open(struct got_commit_graph **graph,
(*graph)->path = strdup(path);
if ((*graph)->path == NULL) {
err = got_error_from_errno("strdup");
- free(*graph);
- *graph = NULL;
- return err;
+ goto done;
}
(*graph)->node_ids = got_object_idset_alloc();
if ((*graph)->node_ids == NULL) {
err = got_error_from_errno("got_object_idset_alloc");
- free((*graph)->path);
- free(*graph);
- *graph = NULL;
- return NULL;
+ goto done;
}
(*graph)->open_branches = got_object_idset_alloc();
if ((*graph)->open_branches == NULL) {
err = got_error_from_errno("got_object_idset_alloc");
- got_object_idset_free((*graph)->node_ids);
- free((*graph)->path);
- free(*graph);
- *graph = NULL;
- return err;
+ goto done;
}
TAILQ_INIT(&(*graph)->iter_list);
if (first_parent_traversal)
(*graph)->flags |= GOT_COMMIT_GRAPH_FIRST_PARENT_TRAVERSAL;
-
- return NULL;
+done:
+ if (err) {
+ got_commit_graph_close(*graph);
+ *graph = NULL;
+ }
+ return err;
}
struct add_branch_tip_arg {
@@ -505,9 +500,11 @@ free_node_iter(struct got_object_id *id, void *data, void *arg)
void
got_commit_graph_close(struct got_commit_graph *graph)
{
- got_object_idset_free(graph->open_branches);
+ if (graph->open_branches)
+ got_object_idset_free(graph->open_branches);
got_object_idset_for_each(graph->node_ids, free_node_iter, NULL);
- got_object_idset_free(graph->node_ids);
+ if (graph->node_ids)
+ got_object_idset_free(graph->node_ids);
free(graph->tips);
free(graph->path);
free(graph);