From 6b2b15ebc842b410c66a31888d11c4156ce7b4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= <leo@yuriev.ru>
Date: Sat, 20 Jul 2024 14:05:16 +0300
Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=B4=D0=BE=D0=BF=D1=83=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5/?=
 =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=84=D0=BB=D0=B0=D0=B3=D0=B8=20=D0=B4=D0=BB=D1=8F=20GC/FreeDB?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=91=D0=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/coherency.c | 10 ++++++++++
 src/dxb.c       |  6 ++++--
 src/meta.c      |  4 +++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/coherency.c b/src/coherency.c
index 5e491b1b..d8406da1 100644
--- a/src/coherency.c
+++ b/src/coherency.c
@@ -158,6 +158,16 @@ __hot int coherency_check_head(MDBX_txn *txn, const meta_ptr_t head,
                                 *timestamp == 0)))
     return coherency_timeout(timestamp, -1, txn->env);
 
+  if (unlikely(txn->dbs[FREE_DBI].flags != MDBX_INTEGERKEY)) {
+    if ((txn->dbs[FREE_DBI].flags & DB_PERSISTENT_FLAGS) != MDBX_INTEGERKEY ||
+        unaligned_peek_u64(4, &head.ptr_c->magic_and_version) ==
+            MDBX_DATA_MAGIC) {
+      ERROR("unexpected/invalid db-flags 0x%u for GC/FreeDB",
+            txn->dbs[FREE_DBI].flags);
+      return MDBX_INCOMPATIBLE;
+    }
+    txn->dbs[FREE_DBI].flags &= DB_PERSISTENT_FLAGS;
+  }
   tASSERT(txn, txn->dbs[FREE_DBI].flags == MDBX_INTEGERKEY);
   tASSERT(txn, check_sdb_flags(txn->dbs[MAIN_DBI].flags));
   return MDBX_SUCCESS;
diff --git a/src/dxb.c b/src/dxb.c
index c91880fe..f9a62d36 100644
--- a/src/dxb.c
+++ b/src/dxb.c
@@ -626,7 +626,8 @@ __cold int dxb_setup(MDBX_env *env, const int lck_rc,
           pv2pages(header.geometry.shrink_pv),
           unaligned_peek_u64(4, header.txnid_a), durable_caption(&header));
 
-  if (unlikely(header.trees.gc.flags != MDBX_INTEGERKEY)) {
+  if (unlikely((header.trees.gc.flags & DB_PERSISTENT_FLAGS) !=
+               MDBX_INTEGERKEY)) {
     ERROR("unexpected/invalid db-flags 0x%u for GC/FreeDB",
           header.trees.gc.flags);
     return MDBX_INCOMPATIBLE;
@@ -1055,7 +1056,8 @@ __cold int dxb_setup(MDBX_env *env, const int lck_rc,
         meta_t *const meta = METAPAGE(env, n);
         if (unlikely(unaligned_peek_u64(4, &meta->magic_and_version) !=
                      MDBX_DATA_MAGIC) ||
-            (meta->dxbid.x | meta->dxbid.y) == 0) {
+            (meta->dxbid.x | meta->dxbid.y) == 0 ||
+            (meta->gc_flags & ~DB_PERSISTENT_FLAGS)) {
           const txnid_t txnid =
               meta_is_used(&troika, n) ? constmeta_txnid(meta) : 0;
           NOTICE("%s %s"
diff --git a/src/meta.c b/src/meta.c
index 7214335b..3711c747 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -541,7 +541,9 @@ __cold int meta_validate(MDBX_env *env, meta_t *const meta,
     return MDBX_RESULT_TRUE;
   }
 
-  if (unlikely(meta->trees.gc.flags != MDBX_INTEGERKEY)) {
+  if (unlikely(meta->trees.gc.flags != MDBX_INTEGERKEY) &&
+      ((meta->trees.gc.flags & DB_PERSISTENT_FLAGS) != MDBX_INTEGERKEY ||
+       magic_and_version == MDBX_DATA_MAGIC)) {
     WARNING("meta[%u] has invalid %s flags 0x%u, skip it", meta_number,
             "GC/FreeDB", meta->trees.gc.flags);
     return MDBX_INCOMPATIBLE;