diff options
| -rw-r--r-- | lib/util/util_net.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/util/util_net.c b/lib/util/util_net.c index 69e5324180..36b3fcbc4a 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -107,11 +107,18 @@ static bool interpret_string_addr_pref(struct sockaddr_storage *pss, */ if (p && (p > str) && ((scope_id = if_nametoindex(p+1)) != 0)) { - size_t len = MIN(PTR_DIFF(p,str)+1, sizeof(addr)); - if (strlcpy(addr, str, len) >= len) { - /* Truncate. */ + /* Length of string we want to copy. + This is IP:v6:addr (removing the %ifname). + */ + size_t len = PTR_DIFF(p,str); + + if (len+1 > sizeof(addr)) { + /* string+nul too long for array. */ return false; } + memcpy(addr, str, len); + addr[len] = '\0'; + str = addr; } } |