From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 May 2021 21:24:55 +0000 (+0200)
Subject: Merge pull request #19662 from yuwata/memdup
X-Git-Tag: v249-rc1~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2adcf6f4f7d1f74b02553d7128f73fcd2886fa55;p=thirdparty%2Fsystemd.git

Merge pull request #19662 from yuwata/memdup

util: make memdup() or friends safer
---

2adcf6f4f7d1f74b02553d7128f73fcd2886fa55
diff --cc src/basic/alloc-util.c
index 5545af5497b,192a516db32..b030f454b2f
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@@ -35,15 -34,11 +34,15 @@@ void* memdup_suffix0(const void *p, siz
          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) {
 +void* greedy_realloc(
 +                void **p,
 +                size_t need,
 +                size_t size) {
 +
          size_t a, newalloc;
          void *q;