From 9a5df2b284f6be7bff112ef93945484f0270b605 Mon Sep 17 00:00:00 2001
From: Leonid Yuriev <leo@yuriev.ru>
Date: Thu, 3 Sep 2020 14:08:02 +0300
Subject: [PATCH] mdbx: refine errors returning from get_page().

Change-Id: I2da37d3b35679f345324d6dd97d2a3f634449b56
---
 src/core.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/core.c b/src/core.c
index dd72de5c..1e555da7 100644
--- a/src/core.c
+++ b/src/core.c
@@ -10882,11 +10882,14 @@ __hot static int mdbx_page_get(MDBX_cursor *mc, pgno_t pgno, MDBX_page **ret,
   MDBX_txn *txn = mc->mc_txn;
   if (unlikely(pgno >= txn->mt_next_pgno)) {
     mdbx_error("page %" PRIaPGNO " beyond next-pgno", pgno);
-    goto corrupted;
+  notfound:
+    *ret = nullptr;
+    txn->mt_flags |= MDBX_TXN_ERROR;
+    return MDBX_PAGE_NOTFOUND;
   }
 
   MDBX_env *const env = txn->mt_env;
-  MDBX_page *p = NULL;
+  MDBX_page *p = nullptr;
   mdbx_assert(env, ((txn->mt_flags ^ env->me_flags) & MDBX_WRITEMAP) == 0);
   mdbx_assert(env, pp_txnid >= MIN_TXNID && pp_txnid <= txn->mt_txnid);
   const uint16_t illegal_bits = (txn->mt_flags & MDBX_TXN_RDONLY)
@@ -10914,11 +10917,14 @@ spilled:
   p = pgno2page(env, pgno);
 
 dirty:
+  *(lvl ? lvl : &level) = level;
+  *ret = p;
+
   if (unlikely(p->mp_pgno != pgno)) {
     bad_page(
         p, "mismatch pgno %" PRIaPGNO " (actual) != %" PRIaPGNO " (expected)\n",
         p->mp_pgno, pgno);
-    goto corrupted;
+    goto notfound;
   }
 
   if (unlikely(p->mp_flags & illegal_bits)) {
@@ -10942,14 +10948,9 @@ dirty:
     goto corrupted;
   }
 
-  if (mdbx_audit_enabled()) {
-    int err = mdbx_page_check(mc, p, C_UPDATING);
-    if (unlikely(err != MDBX_SUCCESS))
-      return err;
-  }
+  if (mdbx_audit_enabled())
+    return mdbx_page_check(mc, p, C_UPDATING);
 
-  *(lvl ? lvl : &level) = level;
-  *ret = p;
   return MDBX_SUCCESS;
 
 corrupted: