From: Howard Chu <hyc@openldap.org>
Date: Mon, 9 Nov 2015 20:09:10 +0000 (+0000)
Subject: ITS#8304 fix page_merge
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c9786b5e8dae8a6e8e49a83c55824eb8e4f2cea;p=openldap

ITS#8304 fix page_merge

Was using the pre-touch dst page pointer instead of the touched page
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 59222cadea..6d9e0a4415 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7854,6 +7854,9 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
 	if ((rc = mdb_page_touch(cdst)))
 		return rc;
 
+	/* get dst page again now that we've touched it. */
+	pdst = cdst->mc_pg[cdst->mc_top];
+
 	/* Move all nodes from src to dst.
 	 */
 	j = nkeys = NUMKEYS(pdst);