From d313008d8260302854da5c94c9ffea11a93e5e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Sun, 2 Mar 2025 11:45:28 +0300 Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D1=81=D0=B8=D0=B3=D0=BD?= =?UTF-8?q?=D0=B0=D1=82=D1=83=D1=80=20=D0=BA=D1=83=D1=80=D1=81=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20=D0=B8=D1=82=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=20(backport).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api-cursor.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/api-cursor.c b/src/api-cursor.c index f58d37f5..b925ac8b 100644 --- a/src/api-cursor.c +++ b/src/api-cursor.c @@ -114,8 +114,12 @@ int mdbx_cursor_unbind(MDBX_cursor *mc) { cASSERT(mc, dbi < mc->txn->n_dbi); if (dbi < mc->txn->n_dbi) { MDBX_cursor **prev = &mc->txn->cursors[dbi]; - while (*prev && *prev != mc) + while (*prev) { + ENSURE(mc->txn->env, (*prev)->signature == cur_signature_live || (*prev)->signature == cur_signature_wait4eot); + if (*prev == mc) + break; prev = &(*prev)->next; + } cASSERT(mc, *prev == mc); *prev = mc->next; } @@ -158,8 +162,12 @@ void mdbx_cursor_close(MDBX_cursor *mc) { tASSERT(txn, dbi < txn->n_dbi); if (dbi < txn->n_dbi) { MDBX_cursor **prev = &txn->cursors[dbi]; - while (*prev && *prev != mc) + while (*prev) { + ENSURE(txn->env, (*prev)->signature == cur_signature_live || (*prev)->signature == cur_signature_wait4eot); + if (*prev == mc) + break; prev = &(*prev)->next; + } tASSERT(txn, *prev == mc); *prev = mc->next; }