diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-08-07 16:55:08 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-08-07 16:55:08 -0700 |
commit | 3ac642ee4cb3ba2f54052fdb7754525bd4a40709 (patch) | |
tree | 843251c3e40466e09e06205abd9614c6d65aabe1 /addrtostr.c | |
parent | 3ac4e726becb967e9a60796c1355e31a382d6ec1 (diff) | |
download | tcpdump-3ac642ee4cb3ba2f54052fdb7754525bd4a40709.tar.gz |
Let strlcpy() do the truncation check.
Diffstat (limited to 'addrtostr.c')
-rw-r--r-- | addrtostr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addrtostr.c b/addrtostr.c index 1ea792ad..caea1775 100644 --- a/addrtostr.c +++ b/addrtostr.c @@ -188,12 +188,12 @@ addrtostr6 (const void *src, char *dst, size_t size) *tp++ = ':'; *tp++ = '\0'; - /* Check for overflow, copy, and we're done. + /* Copy and check for overflow. */ - if ((size_t)(tp - tmp) > size) + if (strlcpy (dst, tmp, size) >= size) { errno = ENOSPC; return (NULL); } - return strcpy (dst, tmp); + return (dst); } |