diff options
| author |   jakob <jakob@openbsd.org> | 2007-12-09 13:57:41 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2007-12-09 13:57:41 +0000 |
| commit | 5a46a4df6bea0a2e38a42058c43eb9a981d20a2c (patch) | |
| tree | a0153e13e293fad3682587cf2dcc6903bf1aa6d9 | |
| parent | regen using autoconf 2.61 (diff) | |
| download | wireguard-openbsd-5a46a4df6bea0a2e38a42058c43eb9a981d20a2c.tar.xz wireguard-openbsd-5a46a4df6bea0a2e38a42058c43eb9a981d20a2c.zip | |
more strcpy fixes
| -rw-r--r-- | usr.sbin/bind/lib/isc/netaddr.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isc/sockaddr.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/dir.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/socket.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/bind/lib/isc/netaddr.c b/usr.sbin/bind/lib/isc/netaddr.c index fb9238b8747..ba0bd4e6569 100644 --- a/usr.sbin/bind/lib/isc/netaddr.c +++ b/usr.sbin/bind/lib/isc/netaddr.c @@ -308,7 +308,7 @@ isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { memset(netaddr, 0, sizeof(*netaddr)); netaddr->family = AF_UNIX; - strcpy(netaddr->type.un, path); + strlcpy(netaddr->type.un, path, sizeof(netaddr->type.un)); netaddr->zone = 0; return (ISC_R_SUCCESS); #else diff --git a/usr.sbin/bind/lib/isc/sockaddr.c b/usr.sbin/bind/lib/isc/sockaddr.c index 730376f3f84..c55e8b20858 100644 --- a/usr.sbin/bind/lib/isc/sockaddr.c +++ b/usr.sbin/bind/lib/isc/sockaddr.c @@ -493,7 +493,7 @@ isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) { sockaddr->type.sunix.sun_len = (unsigned char)sizeof(sockaddr->type.sunix); #endif - strcpy(sockaddr->type.sunix.sun_path, path); + strlcpy(sockaddr->type.sunix.sun_path, path, sizeof(sockaddr->type.sunix.sun_path)); return (ISC_R_SUCCESS); #else UNUSED(sockaddr); diff --git a/usr.sbin/bind/lib/isc/unix/dir.c b/usr.sbin/bind/lib/isc/unix/dir.c index 78b3014f928..7c0c9de10ca 100644 --- a/usr.sbin/bind/lib/isc/unix/dir.c +++ b/usr.sbin/bind/lib/isc/unix/dir.c @@ -70,7 +70,7 @@ isc_dir_open(isc_dir_t *dir, const char *dirname) { if (strlen(dirname) + 3 > sizeof(dir->dirname)) /* XXXDCL ? */ return (ISC_R_NOSPACE); - strcpy(dir->dirname, dirname); + strlcpy(dir->dirname, dirname, sizeof(dir->dirname)); /* * Append path separator, if needed, and "*". diff --git a/usr.sbin/bind/lib/isc/unix/socket.c b/usr.sbin/bind/lib/isc/unix/socket.c index 97822cef4e2..5f6583dc5e4 100644 --- a/usr.sbin/bind/lib/isc/unix/socket.c +++ b/usr.sbin/bind/lib/isc/unix/socket.c @@ -3127,7 +3127,7 @@ isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, REQUIRE(sockaddr->type.sa.sa_family == AF_UNIX); INSIST(strlen(sockaddr->type.sunix.sun_path) < sizeof(path)); - strcpy(path, sockaddr->type.sunix.sun_path); + strlcpy(path, sockaddr->type.sunix.sun_path, sizeof(path)); #ifdef NEED_SECURE_DIRECTORY slash = strrchr(path, '/'); @@ -3135,9 +3135,9 @@ isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, if (slash != path) *slash = '\0'; else - strcpy(path, "/"); + strlcpy(path, "/", sizeof(path)); } else - strcpy(path, "."); + strlcpy(path, ".", sizeof(path)); #endif if (chmod(path, perm) < 0) { |