Mesa (main): util/foz: stop crashing on destroy if prepare hasn't been called

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Jul 17 02:57:46 UTC 2021


Module: Mesa
Branch: main
Commit: 2850db0a9ef3751b1b3429d9b7e75ed22dc4e59e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2850db0a9ef3751b1b3429d9b7e75ed22dc4e59e

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jul 16 12:50:21 2021 -0400

util/foz: stop crashing on destroy if prepare hasn't been called

Fixes: eca6bb9540d ("util/fossilize_db: add basic fossilize db util to read/write shader caches")

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11931>

---

 src/util/fossilize_db.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index 8b122aa492f..8032e979b67 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -334,7 +334,8 @@ foz_prepare(struct foz_db *foz_db, char *cache_path)
 void
 foz_destroy(struct foz_db *foz_db)
 {
-   fclose(foz_db->db_idx);
+   if (foz_db->db_idx)
+      fclose(foz_db->db_idx);
    for (unsigned i = 0; i < FOZ_MAX_DBS; i++) {
       if (foz_db->file[i])
          fclose(foz_db->file[i]);



More information about the mesa-commit mailing list