From: Tom Gundersen <teg@jklm.no>
Date: Sun, 5 Apr 2015 10:17:29 +0000 (+0200)
Subject: sd-device: don't use alloca() within loops
X-Git-Tag: v220~589
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de9b34b6d4250056ae2c483cf22844880504bccc;p=thirdparty%2Fsystemd.git

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
...
---

diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 86d760cddf0..9788df769cf 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)