From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 23 Sep 2013 18:13:27 +0000 (+0200)
Subject: ITS#7515 Fix mdb_page_unspill() in nested txn.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_37~27^2~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8e1d10e82887a0b8fdea6151c73377f9cabeb517;p=openldap

ITS#7515 Fix mdb_page_unspill() in nested txn.

Malloc a page in this txn, not in a parent.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 84429ee3d6..21d11b98de 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1818,7 +1818,7 @@ mdb_page_unspill(MDB_txn *tx0, MDB_page *mp, MDB_page **ret)
 			if (env->me_flags & MDB_WRITEMAP) {
 				np = mp;
 			} else {
-				np = mdb_page_malloc(txn, num);
+				np = mdb_page_malloc(tx0, num);
 				if (!np)
 					return ENOMEM;
 				if (num > 1)