Merge pull request #1656

edfd7f6e Workaround VL32 cursor refcounting miscount (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-02-02 21:39:03 +02:00
commit da9174c8ee
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -1953,13 +1953,15 @@ static void
mdb_cursor_unref(MDB_cursor *mc) mdb_cursor_unref(MDB_cursor *mc)
{ {
int i; int i;
if (!mc->mc_snum || !mc->mc_pg[0] || IS_SUBP(mc->mc_pg[0])) if (mc->mc_txn->mt_rpages[0].mid) {
return; if (!mc->mc_snum || !mc->mc_pg[0] || IS_SUBP(mc->mc_pg[0]))
for (i=0; i<mc->mc_snum; i++) return;
mdb_page_unref(mc->mc_txn, mc->mc_pg[i]); for (i=0; i<mc->mc_snum; i++)
if (mc->mc_ovpg) { mdb_page_unref(mc->mc_txn, mc->mc_pg[i]);
mdb_page_unref(mc->mc_txn, mc->mc_ovpg); if (mc->mc_ovpg) {
mc->mc_ovpg = 0; mdb_page_unref(mc->mc_txn, mc->mc_ovpg);
mc->mc_ovpg = 0;
}
} }
mc->mc_snum = mc->mc_top = 0; mc->mc_snum = mc->mc_top = 0;
mc->mc_pg[0] = NULL; mc->mc_pg[0] = NULL;