ITS#7594 more for subDB cursor fix

[openldap] / libraries / liblmdb / mdb.c

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 0e14320214b5b8e56b496c6e1b1a09d5abc7bc34..0be43fecc2c494928cbe94f9c45426d5d2f25a29 100644 (file)
--- 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;