From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 15 Feb 2022 14:50:14 +0000 (+0900)
Subject: memory-util: introdyce mempcpy_safe()
X-Git-Tag: v251-rc1~281^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=507cd76085482022949fbf18c0a8da3356765967;p=thirdparty%2Fsystemd.git

memory-util: introdyce mempcpy_safe()
---

diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h
index 9f37431fc19..6e3280b9dfe 100644
--- a/src/basic/memory-util.h
+++ b/src/basic/memory-util.h
@@ -15,7 +15,7 @@ size_t page_size(void) _pure_;
 #define PAGE_ALIGN_DOWN(l) ((l) & ~(page_size() - 1))
 #define PAGE_OFFSET(l) ((l) & (page_size() - 1))
 
-/* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */
+/* 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) {
         if (n == 0)
                 return dst;
@@ -23,7 +23,15 @@ static inline void *memcpy_safe(void *dst, const void *src, size_t n) {
         return memcpy(dst, src, n);
 }
 
-/* Normal memcmp requires s1 and s2 to be nonnull. We do nothing if n is 0. */
+/* Normal mempcpy() requires src to be nonnull. We do nothing if n is 0. */
+static inline void *mempcpy_safe(void *dst, const void *src, size_t n) {
+        if (n == 0)
+                return dst;
+        assert(src);
+        return mempcpy(dst, src, n);
+}
+
+/* Normal memcmp() requires s1 and s2 to be nonnull. We do nothing if n is 0. */
 static inline int memcmp_safe(const void *s1, const void *s2, size_t n) {
         if (n == 0)
                 return 0;