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

util/fossilize_db: Update parsed_offset correctly.

Browse source 
If things went perfectly parsed_offset was never updated for the
final entry and we'd seek_set to the start of the last entry. Is
fun when appending to the file next.

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>
(cherry picked from commit 3c51a3aa95)
This commit is contained in:
Bas Nieuwenhuizen 2021-08-05 01:26:15 +02:00 • committed by Dylan Baker
parent 568bbe0dd2
commit 8d52e3cd38
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -625,7 +625,7 @@
"description": "util/fossilize_db: Update parsed_offset correctly.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "2ec1bff0f3a4450a9739d59421dc9c9fe72c94c6"
},

3
src/util/fossilize_db.c
View file

@ -120,8 +120,6 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
fseek(db_idx, offset, SEEK_SET);
while (offset < len) {
parsed_offset = offset;
char bytes_to_read[FOSSILIZE_BLOB_HASH_LENGTH + sizeof(struct foz_payload_header)];
struct foz_payload_header *header;
@ -171,6 +169,7 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
_mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
offset += header->payload_size;
parsed_offset = offset;
}