summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2021-09-04 03:32:21 +0200
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2021-09-04 15:12:06 +0200
commit8de60a1654a875d0b55512a1508f541f706f9b97 (patch)
treeef461c1b640f62a3f27f311a6f3c92ad44c4b3d2
parent5610b5840dea16794cc0ae25ba884ab4d703e567 (diff)
util/fossilize_db: Don't corrupt keys during entry read.
We change the hash that is still used to set entry->key. Fixes: d2d642cc014 "util/fossilize_db: Only allocate entries after full read." Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12725>
-rw-r--r--src/util/fossilize_db.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index e1709a1ff64..26024101b83 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -156,18 +156,18 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
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);
-
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);
+ /* 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);
+
entry->offset = cache_offset;
_mesa_hash_table_u64_insert(foz_db->index_db, key, entry);