From: Howard Chu <hyc@openldap.org>
Date: Wed, 24 Jun 2026 20:19:33 +0000 (+0100)
Subject: ITS#10522 lmdb: fix prev commit
X-Git-Tag: LMDB_1.0.0~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16d65e34741d80a350a99a4f8ffed24cd0476356;p=thirdparty%2Fopenldap.git

ITS#10522 lmdb: fix prev commit
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 0ca6c400d4..eec83654dc 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -8580,11 +8580,12 @@ _mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
 	if (key->mv_size-1 >= ENV_MAXKEY(env))
 		return MDB_BAD_VALSIZE;
 
+	if (mc->mc_db->md_flags & MDB_DUPSORT) {
+		if (!data->mv_size || data->mv_size > ENV_MAXKEY(env))
+			return MDB_BAD_VALSIZE;
+	}
 #if SIZE_MAX > MAXDATASIZE
-	if (data->mv_size-1 >= ((mc->mc_db->md_flags & MDB_DUPSORT) ? ENV_MAXKEY(env) : MAXDATASIZE))
-		return MDB_BAD_VALSIZE;
-#else
-	if ((mc->mc_db->md_flags & MDB_DUPSORT) && data->mv_size-1 >= ENV_MAXKEY(env))
+	if (data->mv_size > MAXDATASIZE)
 		return MDB_BAD_VALSIZE;
 #endif