ITS#8321 deinit empty cursors

Always unset C_INIT flag if the cursor's target DB has been deleted

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index fe78eb9fa86602459d1892c0b3493dc43ccd1a39..43bc85df1c916a1c86b55f022bbadbf61fd1be0f 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -5284,8 +5284,11 @@ mdb_cursor_pop(MDB_cursor *mc)
                        mc->mc_pg[mc->mc_top]->mp_pgno, DDBI(mc), (void *) mc));
 
                mc->mc_snum--;
-               if (mc->mc_snum)
+               if (mc->mc_snum) {
                        mc->mc_top--;
+               } else {
+                       mc->mc_flags &= ~C_INITIALIZED;
+               }
        }
 }
 
@@ -6941,6 +6944,7 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
                if (flags & MDB_NODUPDATA) {
                        /* mdb_cursor_del0() will subtract the final entry */
                        mc->mc_db->md_entries -= mc->mc_xcursor->mx_db.md_entries - 1;
+                       mc->mc_xcursor->mx_cursor.mc_flags &= ~C_INITIALIZED;
                } else {
                        if (!F_ISSET(leaf->mn_flags, F_SUBDATA)) {
                                mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf);
@@ -6978,6 +6982,8 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
                                mc->mc_db->md_entries--;
                                mc->mc_flags |= C_DEL;
                                return rc;
+                       } else {
+                               mc->mc_xcursor->mx_cursor.mc_flags &= ~C_INITIALIZED;
                        }
                        /* otherwise fall thru and delete the sub-DB */
                }
@@ -9767,6 +9773,7 @@ done:
        } else if (rc == MDB_NOTFOUND) {
                rc = MDB_SUCCESS;
        }
+       mc->mc_flags &= ~C_INITIALIZED;
        return rc;
 }