Merge pull request #12829 from yuwata/dhcp-memdup_suffix0

sd-bus,dhcp: use memdup_suffix0() instead of strndup()
This commit is contained in:
Lennart Poettering 2019-06-19 09:00:52 +02:00 committed by GitHub
commit a4eb991831
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -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;

View file

@ -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;