@matheusbsbs / matheus-bagliano / commits / c0befa0c03

commit-graph: close file before returning NULL

There are two reasons that we could return NULL early within load_commit_graph_chain(): 1. The file does not exist, so the file pointer is NULL. 2. The file exists, but is too small to contain a single hash. These were grouped together when the function was first written in 5c84b3396 (commit-graph: load commit-graph chains, 2019-06-18) in order to simplify how the 'chain_name' string is freed. However, the current code leaves a narrow window where the file pointer is not closed when the file exists, but is rejected for being too small. Split out these cases separately to ensure we close the file in this case. Signed-off-by: Kleber Tarcísio <klebertarcisio@yahoo.com.br> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kleber Tarcísio committed Apr 18, 2022 at 17:13 UTC c0befa0c033b2754b93a666fe0e925c080b7d64b

1 file changed +6 -3

commit-graph.c

+6 -3

@@ -523,10 +523,13 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,

523 stat_res = stat(chain_name, &st);

524 free(chain_name);

525

526 - if (!fp ||

527 - stat_res ||

528 - st.st_size <= the_hash_algo->hexsz)

526 + if (!fp)

527 return NULL;

528 + if (stat_res ||

529 + st.st_size <= the_hash_algo->hexsz) {

530 + fclose(fp);

531 + return NULL;

532 + }

533

534 count = st.st_size / (the_hash_algo->hexsz + 1);

535 CALLOC_ARRAY(oids, count);