fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-21 01:00:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/fossilize_db: Only allocate entries after full read.

Browse source 
Should void leaking entries on read failure.

Fixes: 2ec1bff0f3 "util/fossilize_db: Split out reading the index."
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12204>
This commit is contained in:
Bas Nieuwenhuizen 2021-08-05 01:43:01 +02:00 • committed by Marge Bot
parent 96bfefe8d1
commit d2d642cc01
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/util/fossilize_db.c
View file

@ -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}; char hash_str[FOSSILIZE_BLOB_HASH_LENGTH + 1] = {0};
memcpy(hash_str, bytes_to_read, FOSSILIZE_BLOB_HASH_LENGTH); 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 */ /* read cache item offset from index file */
uint64_t cache_offset; uint64_t cache_offset;
if (fread(&cache_offset, 1, sizeof(cache_offset), db_idx) != if (fread(&cache_offset, 1, sizeof(cache_offset), db_idx) !=
sizeof(cache_offset)) sizeof(cache_offset))
break; 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 /* Truncate the entry's hash string to a 64bit hash for use with a
* 64bit hash table for looking up file offsets. * 64bit hash table for looking up file offsets.
*/ */
hash_str[16] = '\0'; hash_str[16] = '\0';
uint64_t key = strtoull(hash_str, NULL, 16); uint64_t key = strtoull(hash_str, NULL, 16);
_mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
offset += header->payload_size; struct foz_db_entry *entry = ralloc(foz_db->mem_ctx,
parsed_offset = offset; 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);
} }