Merge branch 'ps/commit-graph-write-leakfix'

Leakfix.

* ps/commit-graph-write-leakfix:
  commit-graph: fix memory leak when not writing graph
This commit is contained in:
Junio C Hamano
2024-01-26 08:54:45 -08:00

View File

@ -2619,19 +2619,16 @@ cleanup:
oid_array_clear(&ctx->oids); oid_array_clear(&ctx->oids);
clear_topo_level_slab(&topo_levels); clear_topo_level_slab(&topo_levels);
if (ctx->commit_graph_filenames_after) { for (i = 0; i < ctx->num_commit_graphs_before; i++)
for (i = 0; i < ctx->num_commit_graphs_after; i++) { free(ctx->commit_graph_filenames_before[i]);
free(ctx->commit_graph_filenames_after[i]); free(ctx->commit_graph_filenames_before);
free(ctx->commit_graph_hash_after[i]);
}
for (i = 0; i < ctx->num_commit_graphs_before; i++) for (i = 0; i < ctx->num_commit_graphs_after; i++) {
free(ctx->commit_graph_filenames_before[i]); free(ctx->commit_graph_filenames_after[i]);
free(ctx->commit_graph_hash_after[i]);
free(ctx->commit_graph_filenames_after);
free(ctx->commit_graph_filenames_before);
free(ctx->commit_graph_hash_after);
} }
free(ctx->commit_graph_filenames_after);
free(ctx->commit_graph_hash_after);
free(ctx); free(ctx);