From: Howard Chu <hyc@openldap.org>
Date: Fri, 3 May 2024 19:43:39 +0000 (+0100)
Subject: ITS#10212 LMDB: better fix
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6e8631ef92b0c6a8ce09e698483b69231ce16d0;p=thirdparty%2Fopenldap.git

ITS#10212 LMDB: better fix
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 7dbfa59c18..3914658b56 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -3278,10 +3278,6 @@ mdb_txn_renew0(MDB_txn *txn)
 					UNLOCK_MUTEX(rmutex);
 					return MDB_READERS_FULL;
 				}
-				if ((env->me_flags & MDB_RDONLY) && !ti->mti_txnid)  {
-					meta = mdb_env_pick_meta(env);
-					ti->mti_txnid = meta->mm_txnid;
-				}
 				r = &ti->mti_readers[i];
 				/* Claim the reader slot, carefully since other code
 				 * uses the reader table un-mutexed: First reset the
@@ -3307,9 +3303,14 @@ mdb_txn_renew0(MDB_txn *txn)
 			do /* LY: Retry on a race, ITS#7970. */
 				r->mr_txnid = ti->mti_txnid;
 			while(r->mr_txnid != ti->mti_txnid);
+			if (!r->mr_txnid && (env->me_flags & MDB_RDONLY)) {
+				meta = mdb_env_pick_meta(env);
+				r->mr_txnid = meta->mm_txnid;
+			} else {
+				meta = env->me_metas[r->mr_txnid & 1];
+			}
 			txn->mt_txnid = r->mr_txnid;
 			txn->mt_u.reader = r;
-			meta = env->me_metas[txn->mt_txnid & 1];
 		}
 
 	} else {