From: Rasmus Villemoes <ravi@prevas.dk>
Date: Tue, 21 Apr 2026 07:54:36 +0000 (+0200)
Subject: lib/hashtable.c: use memdup_nul() in himport_r
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b87ff4878d081103c45f0ebea7528609a0b173f3;p=thirdparty%2Fu-boot.git

lib/hashtable.c: use memdup_nul() in himport_r

We have memdup_nul() for exactly this pattern of duplicating a block
of memory and ensuring there's a nul byte after the copy.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
---

diff --git a/lib/hashtable.c b/lib/hashtable.c
index 75c263b5053..f96a8e686f6 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -821,13 +821,12 @@ int himport_r(struct hsearch_data *htab,
 	}
 
 	/* we allocate new space to make sure we can write to the array */
-	if ((data = malloc(size + 1)) == NULL) {
-		debug("himport_r: can't malloc %lu bytes\n", (ulong)size + 1);
+	data = memdup_nul(env, size);
+	if (data == NULL) {
+		debug("himport_r: can't duplicate env block\n");
 		__set_errno(ENOMEM);
 		return 0;
 	}
-	memcpy(data, env, size);
-	data[size] = '\0';
 	dp = data;
 
 	/* make a local copy of the list of variables */