From: Howard Chu <hyc@openldap.org>
Date: Fri, 13 Nov 2015 09:25:55 +0000 (+0000)
Subject: ITS#8310 fix mdb_rebalance cursor fixup
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c46119a545410f282b524c297d43929ccca80361;p=openldap

ITS#8310 fix mdb_rebalance cursor fixup

When collapsing root, must adjust entire cursor stack
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index c7580a58c3..6c8f0cef32 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -8091,9 +8091,9 @@ mdb_rebalance(MDB_cursor *mc)
 						m3 = &m2->mc_xcursor->mx_cursor;
 					else
 						m3 = m2;
-					if (m3 == mc || m3->mc_snum < mc->mc_snum) continue;
+					if (m3 == mc) continue;
 					if (m3->mc_pg[0] == mp) {
-						for (i=0; i<m3->mc_snum; i++) {
+						for (i=0; i<mc->mc_db->md_depth; i++) {
 							m3->mc_pg[i] = m3->mc_pg[i+1];
 							m3->mc_ki[i] = m3->mc_ki[i+1];
 						}