From 3d6e1964221dd83e811692170ce6be6888863374 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?= <leo@yuriev.ru>
Date: Fri, 25 Oct 2024 12:31:31 +0300
Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=BC/=D0=BD=D1=83?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B2=D1=8B=D0=BC=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=B8=20=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20`SIGSEGV`=20=D0=BF=D1=80=D0=B8=20=D0=B5?=
 =?UTF-8?q?=D1=91=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dbi.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/dbi.c b/src/dbi.c
index aa60fe8d..fb6577c3 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -472,14 +472,11 @@ static int dbi_open_locked(MDBX_txn *txn, unsigned user_flags, MDBX_dbi *dbi,
   }
 
   /* Done here so we cannot fail after creating a new DB */
-  void *clone = nullptr;
-  if (name.iov_len) {
-    clone = osal_malloc(dbi_namelen(name));
-    if (unlikely(!clone))
-      return MDBX_ENOMEM;
-    name.iov_base = memcpy(clone, name.iov_base, name.iov_len);
-  } else
-    name.iov_base = "";
+  defer_free_item_t *const clone = osal_malloc(dbi_namelen(name));
+  if (unlikely(!clone))
+    return MDBX_ENOMEM;
+  memcpy(clone, name.iov_base, name.iov_len);
+  name.iov_base = clone;
 
   uint8_t dbi_state = DBI_LINDO | DBI_VALID | DBI_FRESH;
   if (unlikely(rc)) {