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

mdbx: fix SIGSEGV regression while copying DB with enabled audit.

Browse Source
This commit is contained in:
Leonid Yuriev 2021-07-22 12:04:54 +03:00
parent 9a04c9a350
commit e731260056
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -17086,7 +17086,7 @@ retry:
__cold static int mdbx_page_check(MDBX_cursor *const mc, __cold static int mdbx_page_check(MDBX_cursor *const mc,
const MDBX_page *const mp, unsigned options) { const MDBX_page *const mp, unsigned options) {
DKBUF; DKBUF;
options |= mc->mc_flags & (C_COPYING | C_UPDATING | C_RETIRING | C_SKIPORD); options |= mc->mc_flags;
MDBX_env *const env = mc->mc_txn->mt_env; MDBX_env *const env = mc->mc_txn->mt_env;
const unsigned nkeys = page_numkeys(mp); const unsigned nkeys = page_numkeys(mp);
char *const end_of_page = (char *)mp + env->me_psize; char *const end_of_page = (char *)mp + env->me_psize;
@ -17098,7 +17098,7 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
if (unlikely(mp->mp_pgno + mp->mp_pages > mc->mc_txn->mt_next_pgno)) if (unlikely(mp->mp_pgno + mp->mp_pages > mc->mc_txn->mt_next_pgno))
return bad_page(mp, "overflow page beyond (%u) next-pgno\n", return bad_page(mp, "overflow page beyond (%u) next-pgno\n",
mp->mp_pgno + mp->mp_pages); mp->mp_pgno + mp->mp_pages);
if (unlikely(mc->mc_db->md_flags & MDBX_DUPSORT)) if (unlikely((options & (C_SUB | C_COPYING)) == C_SUB))
return bad_page(mp, return bad_page(mp,
"unexpected overflow-page for dupsort db (flags 0x%x)\n", "unexpected overflow-page for dupsort db (flags 0x%x)\n",
mc->mc_db->md_flags); mc->mc_db->md_flags);
@ -17110,7 +17110,7 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
if (unlikely(nkeys < 2 && IS_BRANCH(mp))) if (unlikely(nkeys < 2 && IS_BRANCH(mp)))
rc = bad_page(mp, "branch-page nkey (%u) < 2\n", nkeys); rc = bad_page(mp, "branch-page nkey (%u) < 2\n", nkeys);
} }
if (IS_LEAF2(mp) && unlikely((mc->mc_flags & C_SUB) == 0)) if (IS_LEAF2(mp) && unlikely((options & (C_SUB | C_COPYING)) == 0))
rc = bad_page(mp, "unexpected leaf2-page (db flags 0x%x)\n", rc = bad_page(mp, "unexpected leaf2-page (db flags 0x%x)\n",
mc->mc_db->md_flags); mc->mc_db->md_flags);