summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-device
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-04-05 12:17:29 +0200
committerTom Gundersen <teg@jklm.no>2015-04-05 12:17:29 +0200
commitde9b34b6d4250056ae2c483cf22844880504bccc (patch)
treed294c764fe24e7dd1466297d4ab89cd7f9ebe5db /src/libsystemd/sd-device
parent4835f5639a0ec0b8df0b57abdbc2fb07dbe1507c (diff)
sd-device: don't use alloca() within loops
I shall not use alloca() within loops I shall not use alloca() within loops I shall not use alloca() within loops I shall not use alloca() within loops ...
Diffstat (limited to 'src/libsystemd/sd-device')
-rw-r--r--src/libsystemd/sd-device/device-private.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 86d760cddf..9788df769c 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -423,9 +423,10 @@ static int device_amend(sd_device *device, const char *key, const char *value) {
size_t l;
FOREACH_WORD(word, l, value, state) {
- char *devlink;
+ char devlink[l + 1];
- devlink = strndupa(word, l);
+ strncpy(devlink, word, l);
+ devlink[l] = '\0';
r = device_add_devlink(device, devlink);
if (r < 0)
@@ -436,9 +437,10 @@ static int device_amend(sd_device *device, const char *key, const char *value) {
size_t l;
FOREACH_WORD_SEPARATOR(word, l, value, ":", state) {
- char *tag;
+ char tag[l + 1];
- tag = strndupa(word, l);
+ (void)strncpy(tag, word, l);
+ tag[l] = '\0';
r = device_add_tag(device, tag);
if (r < 0)