summaryrefslogtreecommitdiff
path: root/src/basic/alloc-util.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-05-19 21:21:28 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-05-19 21:22:23 +0900
commit550721c2e307f4104a470c27271ab6580b2e5444 (patch)
tree84af340a6ee42cfe010c0d3bf0f5552d370df52b /src/basic/alloc-util.c
parentd1f3b0809855ac199988d369b945556755e3b9b6 (diff)
downloadsystemd-550721c2e307f4104a470c27271ab6580b2e5444.tar.gz
alloc-util: use memcpy_safe() in memdup() or friends
Diffstat (limited to 'src/basic/alloc-util.c')
-rw-r--r--src/basic/alloc-util.c7
1 files changed, 3 insertions, 4 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) {