From 79cd22d6f389c3ee6d711a4c54dc39d3ce6a8c79 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Jun 2019 14:15:06 +0900 Subject: [PATCH 1/2] dhcp: use memdup_suffix0() instead of strndup() --- src/libsystemd-network/dhcp-option.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c index a68de4ff98e..0abb8fdef02 100644 --- a/src/libsystemd-network/dhcp-option.c +++ b/src/libsystemd-network/dhcp-option.c @@ -198,7 +198,7 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo if (memchr(option, 0, len - 1)) return -EINVAL; - string = strndup((const char *) option, len); + string = memdup_suffix0((const char *) option, len); if (!string) return -ENOMEM; From bccd91629213eba8e4f324387dee619a008ecb2f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Jun 2019 14:29:00 +0900 Subject: [PATCH 2/2] sd-bus: use memdup_suffix0() instead of strndup() --- src/libsystemd/sd-bus/bus-message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 774bf102190..5360bce9040 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -5265,7 +5265,7 @@ int bus_message_parse_fields(sd_bus_message *m) { if (!b) return -EBADMSG; - sig = strndup(b+1, item_size - (b+1-(char*) q)); + sig = memdup_suffix0(b+1, item_size - (b+1-(char*) q)); if (!sig) return -ENOMEM;