ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 15:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: refine prev commit (avoids SIGSEGV but assertion failure).

Browse Source 
More related to https://github.com/erthink/libmdbx/issues/146

Change-Id: Ie5277a8cc56421d20a7c9aad83724991b2efdc2d
This commit is contained in:
Leonid Yuriev
2020-12-15 15:43:19 +03:00
parent 3758e7697e
commit 166ed1c7d4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core.c
View File

@@ -14277,13 +14277,14 @@ void mdbx_cursor_close(MDBX_cursor *mc) {
mdbx_ensure(NULL, mc->mc_signature == MDBX_MC_LIVE || mdbx_ensure(NULL, mc->mc_signature == MDBX_MC_LIVE ||
mc->mc_signature == MDBX_MC_READY4CLOSE); mc->mc_signature == MDBX_MC_READY4CLOSE);
MDBX_txn *const txn = mc->mc_txn; MDBX_txn *const txn = mc->mc_txn;
MDBX_env *const env = txn ? txn->mt_env : NULL;
if (!mc->mc_backup) { if (!mc->mc_backup) {
mc->mc_txn = NULL; mc->mc_txn = NULL;
/* Remove from txn, if tracked. /* Remove from txn, if tracked.
* A read-only txn (!C_UNTRACK) may have been freed already, * A read-only txn (!C_UNTRACK) may have been freed already,
* so do not peek inside it. Only write txns track cursors. */ * so do not peek inside it. Only write txns track cursors. */
if (mc->mc_flags & C_UNTRACK) { if (mc->mc_flags & C_UNTRACK) {
mdbx_ensure(txn->mt_env, check_txn_rw(txn, 0) == MDBX_SUCCESS); mdbx_ensure(env, check_txn_rw(txn, 0) == MDBX_SUCCESS);
MDBX_cursor **prev = &txn->tw.cursors[mc->mc_dbi]; MDBX_cursor **prev = &txn->tw.cursors[mc->mc_dbi];
while (*prev && *prev != mc) while (*prev && *prev != mc)
prev = &(*prev)->mc_next; prev = &(*prev)->mc_next;
@@ -14296,7 +14297,7 @@ void mdbx_cursor_close(MDBX_cursor *mc) {
} else { } else {
/* Cursor closed before nested txn ends */ /* Cursor closed before nested txn ends */
mdbx_cassert(mc, mc->mc_signature == MDBX_MC_LIVE); mdbx_cassert(mc, mc->mc_signature == MDBX_MC_LIVE);
mdbx_ensure(txn->mt_env, check_txn_rw(txn, 0) == MDBX_SUCCESS); mdbx_ensure(env, check_txn_rw(txn, 0) == MDBX_SUCCESS);
mc->mc_signature = MDBX_MC_WAIT4EOT; mc->mc_signature = MDBX_MC_WAIT4EOT;
} }
} }