From d1f3b0809855ac199988d369b945556755e3b9b6 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 May 2021 21:20:49 +0900
Subject: [PATCH 1/2] memory-util: make memcpy_safe() return pointer to
 destination

---
 src/basic/memory-util.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h
index 179edd247b..4ca3060c0c 100644
--- a/src/basic/memory-util.h
+++ b/src/basic/memory-util.h
@@ -16,11 +16,11 @@ size_t page_size(void) _pure_;
 #define PAGE_OFFSET(l) ((l) & (page_size() - 1))
 
 /* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */
-static inline void memcpy_safe(void *dst, const void *src, size_t n) {
+static inline void *memcpy_safe(void *dst, const void *src, size_t n) {
         if (n == 0)
-                return;
+                return dst;
         assert(src);
-        memcpy(dst, src, n);
+        return memcpy(dst, src, n);
 }
 
 /* Normal memcmp requires s1 and s2 to be nonnull. We do nothing if n is 0. */

From 550721c2e307f4104a470c27271ab6580b2e5444 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 May 2021 21:21:28 +0900
Subject: [PATCH 2/2] alloc-util: use memcpy_safe() in memdup() or friends

---
 src/basic/alloc-util.c | 7 +++----
 src/basic/alloc-util.h | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c
index bad15cc204..192a516db3 100644
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@ -17,8 +17,7 @@ void* memdup(const void *p, size_t l) {
         if (!ret)
                 return NULL;
 
-        memcpy(ret, p, l);
-        return ret;
+        return memcpy_safe(ret, p, l);
 }
 
 void* memdup_suffix0(const void *p, size_t l) {
@@ -35,8 +34,8 @@ void* memdup_suffix0(const void *p, size_t l) {
         if (!ret)
                 return NULL;
 
-        *((uint8_t*) mempcpy(ret, p, l)) = 0;
-        return ret;
+        ((uint8_t*) ret)[l] = 0;
+        return memcpy_safe(ret, p, l);
 }
 
 void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size) {
diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index 698a6583c5..0c033213a7 100644
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -66,7 +66,7 @@ void* memdup_suffix0(const void *p, size_t l); /* We can't use _alloc_() here, s
                 size_t _l_ = l;                 \
                 assert(_l_ <= ALLOCA_MAX);      \
                 _q_ = alloca(_l_ ?: 1);         \
-                memcpy(_q_, p, _l_);            \
+                memcpy_safe(_q_, p, _l_);       \
         })
 
 #define memdupa_suffix0(p, l)                   \
@@ -76,7 +76,7 @@ void* memdup_suffix0(const void *p, size_t l); /* We can't use _alloc_() here, s
                 assert(_l_ <= ALLOCA_MAX);      \
                 _q_ = alloca(_l_ + 1);          \
                 ((uint8_t*) _q_)[_l_] = 0;      \
-                memcpy(_q_, p, _l_);            \
+                memcpy_safe(_q_, p, _l_);       \
         })
 
 static inline void freep(void *p) {