From 91743d66e6e91058fff8917b5e39b8d49bfa4d7a Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 20 May 2015 03:17:47 +0200
Subject: [PATCH] mtest*.c: Fix MDB_NOOVERWRITE, plug cursor leak

---
 libraries/liblmdb/mtest.c  | 6 ++++--
 libraries/liblmdb/mtest2.c | 4 ++--
 libraries/liblmdb/mtest6.c | 9 ++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libraries/liblmdb/mtest.c b/libraries/liblmdb/mtest.c
index 7efa8b5..9d15088 100644
--- a/libraries/liblmdb/mtest.c
+++ b/libraries/liblmdb/mtest.c
@@ -54,12 +54,13 @@ int main(int argc,char * argv[])
    
 		key.mv_size = sizeof(int);
 		key.mv_data = sval;
-		data.mv_size = sizeof(sval);
-		data.mv_data = sval;
 
 		printf("Adding %d values\n", count);
 	    for (i=0;i<count;i++) {	
 			sprintf(sval, "%03x %d foo bar", values[i], values[i]);
+			/* Set <data> in each iteration, since MDB_NOOVERWRITE may modify it */
+			data.mv_size = sizeof(sval);
+			data.mv_data = sval;
 			if (RES(MDB_KEYEXIST, mdb_put(txn, dbi, &key, &data, MDB_NOOVERWRITE))) {
 				j++;
 				data.mv_size = sizeof(sval);
@@ -130,6 +131,7 @@ int main(int argc,char * argv[])
 				(int) key.mv_size,  (char *) key.mv_data,
 				(int) data.mv_size, (char *) data.mv_data);
 
+		mdb_cursor_close(cursor);
 		mdb_txn_abort(txn);
 
 		printf("Deleting with cursor\n");
diff --git a/libraries/liblmdb/mtest2.c b/libraries/liblmdb/mtest2.c
index cc6ecf6..eacbe59 100644
--- a/libraries/liblmdb/mtest2.c
+++ b/libraries/liblmdb/mtest2.c
@@ -57,12 +57,12 @@ int main(int argc,char * argv[])
    
 	key.mv_size = sizeof(int);
 	key.mv_data = sval;
-	data.mv_size = sizeof(sval);
-	data.mv_data = sval;
 
 	printf("Adding %d values\n", count);
 	for (i=0;i<count;i++) {	
 		sprintf(sval, "%03x %d foo bar", values[i], values[i]);
+		data.mv_size = sizeof(sval);
+		data.mv_data = sval;
 		if (RES(MDB_KEYEXIST, mdb_put(txn, dbi, &key, &data, MDB_NOOVERWRITE)))
 			j++;
 	}
diff --git a/libraries/liblmdb/mtest6.c b/libraries/liblmdb/mtest6.c
index 174f4f6..ae3c7f2 100644
--- a/libraries/liblmdb/mtest6.c
+++ b/libraries/liblmdb/mtest6.c
@@ -31,7 +31,7 @@ int main(int argc,char * argv[])
 	int i = 0, j = 0, rc;
 	MDB_env *env;
 	MDB_dbi dbi;
-	MDB_val key, data;
+	MDB_val key, data, sdata;
 	MDB_txn *txn;
 	MDB_stat mst;
 	MDB_cursor *cursor;
@@ -55,25 +55,28 @@ int main(int argc,char * argv[])
 	sval = calloc(1, mst.ms_psize / 4);
 	key.mv_size = sizeof(long);
 	key.mv_data = &kval;
-	data.mv_size = mst.ms_psize / 4 - 30;
-	data.mv_data = sval;
+	sdata.mv_size = mst.ms_psize / 4 - 30;
+	sdata.mv_data = sval;
 
 	printf("Adding 12 values, should yield 3 splits\n");
 	for (i=0;i<12;i++) {
 		kval = i*5;
 		sprintf(sval, "%08x", kval);
+		data = sdata;
 		(void)RES(MDB_KEYEXIST, mdb_cursor_put(cursor, &key, &data, MDB_NOOVERWRITE));
 	}
 	printf("Adding 12 more values, should yield 3 splits\n");
 	for (i=0;i<12;i++) {
 		kval = i*5+4;
 		sprintf(sval, "%08x", kval);
+		data = sdata;
 		(void)RES(MDB_KEYEXIST, mdb_cursor_put(cursor, &key, &data, MDB_NOOVERWRITE));
 	}
 	printf("Adding 12 more values, should yield 3 splits\n");
 	for (i=0;i<12;i++) {
 		kval = i*5+1;
 		sprintf(sval, "%08x", kval);
+		data = sdata;
 		(void)RES(MDB_KEYEXIST, mdb_cursor_put(cursor, &key, &data, MDB_NOOVERWRITE));
 	}
 	E(mdb_cursor_get(cursor, &key, &data, MDB_FIRST));