From d2d642cc014af75f0396e04528b29f9a61f91043 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Thu, 5 Aug 2021 01:43:01 +0200 Subject: [PATCH] util/fossilize_db: Only allocate entries after full read. Should void leaking entries on read failure. Fixes: 2ec1bff0f3a "util/fossilize_db: Split out reading the index." Reviewed-by: Timothy Arceri Part-of: --- src/util/fossilize_db.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c index 46217f8a597..5295d5c5561 100644 --- a/src/util/fossilize_db.c +++ b/src/util/fossilize_db.c @@ -147,29 +147,30 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx) char hash_str[FOSSILIZE_BLOB_HASH_LENGTH + 1] = {0}; memcpy(hash_str, bytes_to_read, FOSSILIZE_BLOB_HASH_LENGTH); - struct foz_db_entry *entry = ralloc(foz_db->mem_ctx, - struct foz_db_entry); - entry->header = *header; - entry->file_idx = file_idx; - _mesa_sha1_hex_to_sha1(entry->key, hash_str); - /* read cache item offset from index file */ uint64_t cache_offset; if (fread(&cache_offset, 1, sizeof(cache_offset), db_idx) != sizeof(cache_offset)) break; - entry->offset = cache_offset; + offset += header->payload_size; + parsed_offset = offset; /* Truncate the entry's hash string to a 64bit hash for use with a * 64bit hash table for looking up file offsets. */ hash_str[16] = '\0'; uint64_t key = strtoull(hash_str, NULL, 16); - _mesa_hash_table_u64_insert(foz_db->index_db, key, entry); - offset += header->payload_size; - parsed_offset = offset; + struct foz_db_entry *entry = ralloc(foz_db->mem_ctx, + struct foz_db_entry); + entry->header = *header; + entry->file_idx = file_idx; + _mesa_sha1_hex_to_sha1(entry->key, hash_str); + + entry->offset = cache_offset; + + _mesa_hash_table_u64_insert(foz_db->index_db, key, entry); }