From: Howard Chu <hyc@symas.com>
Date: Wed, 26 Mar 2014 09:18:20 +0000 (-0700)
Subject: Revert "ITS#7793 mdb_cursor_put(): Fix MDB_CURRENT."
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~132^2~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9026894e05a016f4e7cfe675490b7ede3db10e73;p=openldap

Revert "ITS#7793 mdb_cursor_put(): Fix MDB_CURRENT."

This reverts commit 4e954f8ae83d5b39736bab2da0eaf2bdf5ee3961.
Caused ITS#7828.
---

diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index 62f0a485de..646943cab9 100644
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -1334,7 +1334,7 @@ int  mdb_cursor_get(MDB_cursor *cursor, MDB_val *key, MDB_val *data,
 	 * <ul>
 	 *	<li>#MDB_CURRENT - overwrite the data of the key/data pair to which
 	 *		the cursor refers with the specified data item. The \b key
-	 *		parameter is ignored.  The \b data size must match the original.
+	 *		parameter is ignored.
 	 *	<li>#MDB_NODUPDATA - enter the new key/data pair only if it does not
 	 *		already appear in the database. This flag may only be specified
 	 *		if the database was opened with #MDB_DUPSORT. The function will
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 0e5c361887..64163fa531 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2776,11 +2776,10 @@ mdb_freelist_save(MDB_txn *txn)
 			MDB_ID save;
 
 			mdb_tassert(txn, len >= 0 && id <= env->me_pglast);
+			key.mv_data = &id;
 			if (len > mop_len) {
 				len = mop_len;
 				data.mv_size = (len + 1) * sizeof(MDB_ID);
-				/* Drop MDB_CURRENT when changing the data size */
-				key.mv_data = &id;
 				flags = 0;
 			}
 			data.mv_data = mop -= len;
@@ -5807,7 +5806,7 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
 	unsigned int nflags;
 	DKBUF;
 
-	if (mc == NULL)
+	if (mc == NULL || key == NULL)
 		return EINVAL;
 
 	env = mc->mc_txn->mt_env;
@@ -5828,16 +5827,8 @@ 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) {
-		if (key == NULL)
-			return EINVAL;
-		if (key->mv_size-1 >= ENV_MAXKEY(env))
-			return MDB_BAD_VALSIZE;
-	} else {
-		/* Ignore key except in sub-cursor, where key holds the data */
-		if (!(mc->mc_flags & C_SUB))
-			key = NULL;
-	}
+	if (flags != MDB_CURRENT && key->mv_size-1 >= ENV_MAXKEY(env))
+		return MDB_BAD_VALSIZE;
 
 #if SIZE_MAX > MAXDATASIZE
 	if (data->mv_size > ((mc->mc_db->md_flags & MDB_DUPSORT) ? ENV_MAXKEY(env) : MAXDATASIZE))
@@ -6161,7 +6152,7 @@ current:
 			 */
 			if (F_ISSET(flags, MDB_RESERVE))
 				data->mv_data = olddata.mv_data;
-			else if (!(mc->mc_flags & C_SUB))
+			else if (data->mv_size)
 				memcpy(olddata.mv_data, data->mv_data, data->mv_size);
 			else
 				memcpy(NODEKEY(leaf), key->mv_data, key->mv_size);