From: Howard Chu <hyc@symas.com>
Date: Wed, 5 Jun 2013 23:13:43 +0000 (-0700)
Subject: ITS#7594 more for subDB cursor fix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~36^2~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aff123ba113728a254339c07560b7d98c88f30a6;p=openldap

ITS#7594 more for subDB cursor fix
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 0e14320214..0be43fecc2 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -5413,8 +5413,18 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
 					void *db = NODEDATA(leaf);
 					memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db));
 				} else {
+					MDB_cursor *m2;
 					/* shrink fake page */
 					mdb_node_shrink(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
+					leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
+					mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf);
+					/* fix other sub-DB cursors pointed at this fake page */
+					for (m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2; m2=m2->mc_next) {
+						if (m2 == mc || m2->mc_snum < mc->mc_snum) continue;
+						if (m2->mc_pg[mc->mc_top] == mc->mc_pg[mc->mc_top] &&
+							m2->mc_ki[mc->mc_top] == mc->mc_ki[mc->mc_top])
+							m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf);
+					}
 				}
 				mc->mc_db->md_entries--;
 				return rc;