From 863fa77a086e01c439e59a0b4c51be7d88b2e146 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 26 Mar 2013 11:24:59 -0700 Subject: [PATCH] ITS#7553 better fix --- libraries/liblmdb/mdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index ec003b759d..7866e89cb6 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -6403,7 +6403,7 @@ mdb_rebalance(MDB_cursor *mc) static int mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf) { - int rc, eof; + int rc; /* add overflow pages to free list */ if (!IS_LEAF2(mc->mc_pg[mc->mc_top]) && F_ISSET(leaf->mn_flags, F_BIGDATA)) { @@ -6421,11 +6421,11 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf) } mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], mc->mc_db->md_pad); mc->mc_db->md_entries--; - eof = mc->mc_flags & C_EOF; rc = mdb_rebalance(mc); if (rc != MDB_SUCCESS) mc->mc_txn->mt_flags |= MDB_TXN_ERROR; - else if (eof) + /* if mc points past last node in page, invalidate */ + else if (mc->mc_ki[mc->mc_top] >= NUMKEYS(mc->mc_pg[mc->mc_top])) mc->mc_flags &= ~C_INITIALIZED; return rc; -- 2.39.5