diff options
| author | Howard Chu <hyc@symas.com> | 2017-01-31 10:38:12 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2017-01-31 10:38:12 +0000 |
| commit | edfd7f6e078ce5f038d80007d195579f5ec4bdd0 (patch) | |
| tree | 380f41cc176dbeb907e1056e3108f73306667f1b | |
| parent | Merge pull request #1649 (diff) | |
| download | monero-edfd7f6e078ce5f038d80007d195579f5ec4bdd0.tar.xz | |
Workaround VL32 cursor refcounting miscount
Don't try to deref cursor page if txn's pagelist is empty
| -rw-r--r-- | external/db_drivers/liblmdb/mdb.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/external/db_drivers/liblmdb/mdb.c b/external/db_drivers/liblmdb/mdb.c index 32e225163..d778037b0 100644 --- a/external/db_drivers/liblmdb/mdb.c +++ b/external/db_drivers/liblmdb/mdb.c @@ -1953,13 +1953,15 @@ static void mdb_cursor_unref(MDB_cursor *mc) { int i; - if (!mc->mc_snum || !mc->mc_pg[0] || IS_SUBP(mc->mc_pg[0])) - return; - for (i=0; i<mc->mc_snum; i++) - mdb_page_unref(mc->mc_txn, mc->mc_pg[i]); - if (mc->mc_ovpg) { - mdb_page_unref(mc->mc_txn, mc->mc_ovpg); - mc->mc_ovpg = 0; + if (mc->mc_txn->mt_rpages[0].mid) { + if (!mc->mc_snum || !mc->mc_pg[0] || IS_SUBP(mc->mc_pg[0])) + return; + for (i=0; i<mc->mc_snum; i++) + mdb_page_unref(mc->mc_txn, mc->mc_pg[i]); + if (mc->mc_ovpg) { + mdb_page_unref(mc->mc_txn, mc->mc_ovpg); + mc->mc_ovpg = 0; + } } mc->mc_snum = mc->mc_top = 0; mc->mc_pg[0] = NULL; |