From 3979ba4784a394c553562af696b7667b6a3c1f89 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Fri, 10 Aug 2018 18:33:59 +0300 Subject: [PATCH] mdbx: backport - fix assertions. Change-Id: I95c43ef1ea2da55a124dc43f03890cf1d96f2e61 --- src/mdbx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mdbx.c b/src/mdbx.c index 77799f13..9a70a641 100644 --- a/src/mdbx.c +++ b/src/mdbx.c @@ -7828,8 +7828,6 @@ int mdbx_cursor_put(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, memcpy(olddata.iov_base, data->iov_base, data->iov_len); else { mdbx_cassert(mc, NUMKEYS(mc->mc_pg[mc->mc_top]) == 1); - mdbx_cassert(mc, mc->mc_pg[mc->mc_top]->mp_upper == - mc->mc_pg[mc->mc_top]->mp_lower); mdbx_cassert(mc, IS_LEAF(mc->mc_pg[mc->mc_top]) && !IS_LEAF2(mc->mc_pg[mc->mc_top])); mdbx_cassert(mc, NODEDSZ(leaf) == 0); @@ -7837,7 +7835,7 @@ int mdbx_cursor_put(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, mdbx_cassert(mc, key->iov_len < UINT16_MAX); leaf->mn_ksize = (uint16_t)key->iov_len; memcpy(NODEKEY(leaf), key->iov_base, key->iov_len); - assert((char *)NODEDATA(leaf) + NODEDSZ(leaf) < + assert((char *)NODEKEY(leaf) + NODEDSZ(leaf) < (char *)(mc->mc_pg[mc->mc_top]) + env->me_psize); goto fix_parent; }