fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/fossilize_db: Fix double free in error handling.

Browse source 
If the file ptr is not NULL then foz_destroy will also try to destroy it.

Fixes: eca6bb9540 ("util/fossilize_db: add basic fossilize db util to read/write shader caches")
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14671>
(cherry picked from commit 51416b1a12)
This commit is contained in:
Bas Nieuwenhuizen 2022-01-23 23:43:49 +01:00 • committed by Eric Engestrom
parent 2143a663da
commit f15d2c8d3a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -931,7 +931,7 @@
"description": "util/fossilize_db: Fix double free in error handling.", "description": "util/fossilize_db: Fix double free in error handling.",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "eca6bb9540d8d1b260511cd0a71bdddb00ff4a3c" "because_sha": "eca6bb9540d8d1b260511cd0a71bdddb00ff4a3c"
}, },

6
src/util/fossilize_db.c
View file

@ -318,8 +318,12 @@ foz_prepare(struct foz_db *foz_db, char *cache_path)
free(filename); free(filename);
free(idx_filename); free(idx_filename);
if (!check_files_opened_successfully(foz_db->file[file_idx], db_idx)) if (!check_files_opened_successfully(foz_db->file[file_idx], db_idx)) {
/* Prevent foz_destroy from destroying it a second time. */
foz_db->file[file_idx] = NULL;
continue; /* Ignore invalid user provided filename and continue */ continue; /* Ignore invalid user provided filename and continue */
}
if (!load_foz_dbs(foz_db, db_idx, file_idx, true)) { if (!load_foz_dbs(foz_db, db_idx, file_idx, true)) {
fclose(db_idx); fclose(db_idx);