From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 30 May 2014 07:06:08 +0000 (+0200)
Subject: More ITS#7793 Check key->mv_size with MDB_CURRENT.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~132^2~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2f33effcdc4f21fec8da9921044de0d124709e80;p=openldap

More ITS#7793 Check key->mv_size with MDB_CURRENT.

Since non-NULL key must be provided now.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 55b8a1dff1..b04c9206db 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -5825,7 +5825,7 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
 	if (mc->mc_txn->mt_flags & (MDB_TXN_RDONLY|MDB_TXN_ERROR))
 		return (mc->mc_txn->mt_flags & MDB_TXN_RDONLY) ? EACCES : MDB_BAD_TXN;
 
-	if (flags != MDB_CURRENT && key->mv_size-1 >= ENV_MAXKEY(env))
+	if (key->mv_size-1 >= ENV_MAXKEY(env))
 		return MDB_BAD_VALSIZE;
 
 #if SIZE_MAX > MAXDATASIZE