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

mdbx: fix potential SIGSEGV for DB with non-default page size.

Browse Source 
Related to https://github.com/erthink/libmdbx/issues/267.
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-02-13 17:04:10 +03:00
parent 2b6fd968d2
commit c27787eb31
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core.c
View File

@ -11114,6 +11114,10 @@ __cold static void mdbx_setup_pagesize(MDBX_env *env, const size_t pagesize) {
mdbx_ensure(env, pagesize >= MIN_PAGESIZE);
mdbx_ensure(env, pagesize <= MAX_PAGESIZE);
env->me_psize = (unsigned)pagesize;
if (env->me_pbuf) {
mdbx_memalign_free(env->me_pbuf);
env->me_pbuf = nullptr;
}
STATIC_ASSERT(MAX_GC1OVPAGE(MIN_PAGESIZE) > 4);
STATIC_ASSERT(MAX_GC1OVPAGE(MAX_PAGESIZE) < MDBX_PGL_LIMIT);
@ -11722,7 +11726,8 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
pv2pages(meta.mm_geo.grow_pv), pv2pages(meta.mm_geo.shrink_pv),
unaligned_peek_u64(4, meta.mm_txnid_a), mdbx_durable_str(&meta));
mdbx_setup_pagesize(env, meta.mm_psize);
if (env->me_psize != meta.mm_psize)
mdbx_setup_pagesize(env, meta.mm_psize);
const size_t used_bytes = pgno2bytes(env, meta.mm_geo.next);
const size_t used_aligned2os_bytes =
ceil_powerof2(used_bytes, env->me_os_psize);