ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 23:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: устранение чтения освобожденной памяти и жалоб ASAN при спиллинге.

Browse Source 
Вероятность проявляния проблемы крайне низкая, но стало воспроизводиться после доработки спллинга.
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-12-19 21:22:42 +03:00
parent ffdff3f831
commit bf2f3bfbbf
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core.c
View File

@ -4696,10 +4696,14 @@ static size_t cursor_keep(MDBX_txn *txn, MDBX_cursor *mc) {
tASSERT(txn, (txn->mt_flags & MDBX_TXN_RDONLY) == 0); tASSERT(txn, (txn->mt_flags & MDBX_TXN_RDONLY) == 0);
tASSERT(txn, (txn->mt_flags & MDBX_WRITEMAP) == 0 || MDBX_AVOID_MSYNC); tASSERT(txn, (txn->mt_flags & MDBX_WRITEMAP) == 0 || MDBX_AVOID_MSYNC);
size_t keep = 0; size_t keep = 0;
while (mc->mc_flags & C_INITIALIZED) { while ((mc->mc_flags & C_INITIALIZED) && mc->mc_snum) {
for (size_t i = 0; i < mc->mc_snum; ++i) { tASSERT(txn, mc->mc_top == mc->mc_snum - 1);
const MDBX_page *mp = mc->mc_pg[i]; const MDBX_page *mp;
if (IS_MODIFIABLE(txn, mp) && !IS_SUBP(mp)) { size_t i = 0;
do {
mp = mc->mc_pg[i];
tASSERT(txn, !IS_SUBP(mp));
if (IS_MODIFIABLE(txn, mp)) {
size_t const n = dpl_search(txn, mp->mp_pgno); size_t const n = dpl_search(txn, mp->mp_pgno);
if (txn->tw.dirtylist->items[n].pgno == mp->mp_pgno && if (txn->tw.dirtylist->items[n].pgno == mp->mp_pgno &&
dpl_age(txn, n)) { dpl_age(txn, n)) {
@ -4709,8 +4713,13 @@ static size_t cursor_keep(MDBX_txn *txn, MDBX_cursor *mc) {
++keep; ++keep;
} }
} }
} } while (++i < mc->mc_snum);
if (!mc->mc_xcursor)
tASSERT(txn, IS_LEAF(mp));
if (!mc->mc_xcursor || mc->mc_ki[mc->mc_top] >= page_numkeys(mp))
break;
const MDBX_node *const node = page_node(mp, mc->mc_ki[mc->mc_top]);
if (!(node->mn_flags & F_SUBDATA))
break; break;
mc = &mc->mc_xcursor->mx_cursor; mc = &mc->mc_xcursor->mx_cursor;
} }
@ -15667,7 +15676,8 @@ __hot static int page_search(MDBX_cursor *mc, const MDBX_val *key, int flags) {
} }
cASSERT(mc, root >= NUM_METAS); cASSERT(mc, root >= NUM_METAS);
if (!mc->mc_pg[0] || mc->mc_pg[0]->mp_pgno != root) { if (!mc->mc_snum || !(mc->mc_flags & C_INITIALIZED) ||
mc->mc_pg[0]->mp_pgno != root) {
txnid_t pp_txnid = mc->mc_db->md_mod_txnid; txnid_t pp_txnid = mc->mc_db->md_mod_txnid;
pp_txnid = /* mc->mc_db->md_mod_txnid maybe zero in a legacy DB */ pp_txnid pp_txnid = /* mc->mc_db->md_mod_txnid maybe zero in a legacy DB */ pp_txnid
? pp_txnid ? pp_txnid