diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-09 00:25:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-09 00:25:05 +0300 |
| commit | 95875e0356c1b0e66e4bb7f232bca4db717a44af (patch) | |
| tree | aa1a7bd76409a3b0ae5e989e662fff5e285dd4ac /commit-graph.c | |
| parent | 6de1630898838b62b97617323a07eb6fe9618a7e (diff) | |
| parent | fbda77c6c00a7cec65c4f266b09252df73a9deff (diff) | |
Merge branch 'jt/commit-graph-plug-memleak'
Fix a leak noticed by fuzzer.
* jt/commit-graph-plug-memleak:
commit-graph: avoid memory leaks
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/commit-graph.c b/commit-graph.c index aa3adb912f..5ea0c8e15c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -281,8 +281,7 @@ struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size) if (data + graph_size - chunk_lookup < GRAPH_CHUNKLOOKUP_WIDTH) { error(_("commit-graph chunk lookup table entry missing; file may be incomplete")); - free(graph); - return NULL; + goto free_and_return; } chunk_id = get_be32(chunk_lookup + 0); @@ -293,8 +292,7 @@ struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size) if (chunk_offset > graph_size - the_hash_algo->rawsz) { error(_("commit-graph improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32), (uint32_t)chunk_offset); - free(graph); - return NULL; + goto free_and_return; } switch (chunk_id) { @@ -361,8 +359,7 @@ struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size) if (chunk_repeated) { error(_("commit-graph chunk id %08x appears multiple times"), chunk_id); - free(graph); - return NULL; + goto free_and_return; } if (last_chunk_id == GRAPH_CHUNKID_OIDLOOKUP) @@ -381,17 +378,20 @@ struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size) /* We need both the bloom chunks to exist together. Else ignore the data */ graph->chunk_bloom_indexes = NULL; graph->chunk_bloom_data = NULL; - graph->bloom_filter_settings = NULL; + FREE_AND_NULL(graph->bloom_filter_settings); } hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len); - if (verify_commit_graph_lite(graph)) { - free(graph); - return NULL; - } + if (verify_commit_graph_lite(graph)) + goto free_and_return; return graph; + +free_and_return: + free(graph->bloom_filter_settings); + free(graph); + return NULL; } static struct commit_graph *load_commit_graph_one(const char *graph_file, |