diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-08-27 10:08:37 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-08-27 10:08:37 +0000 |
| commit | d8163e1ddeee25639861566c36ace1c5acdcb2da (patch) | |
| tree | 76663de6ee82203f6b4c36cc1863bb9b22fcee6b | |
| parent | +issetugid (diff) | |
| download | wireguard-openbsd-d8163e1ddeee25639861566c36ace1c5acdcb2da.tar.xz wireguard-openbsd-d8163e1ddeee25639861566c36ace1c5acdcb2da.zip | |
strncpy correctly
| -rw-r--r-- | libexec/ftpd/ftpd.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index e79d92e8878..6ca18fdaf23 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.16 1996/08/25 21:04:56 deraadt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.17 1996/08/27 10:08:37 deraadt Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -609,8 +609,10 @@ user(name) return; } } - if (logging) + if (logging) { strncpy(curname, name, sizeof(curname)-1); + curname[sizeof(curname)-1] = '\0'; + } #ifdef SKEY if (!skey_haskey(name)) { char *myskey, *skey_keyinfo __P((char *name)); @@ -1662,10 +1664,11 @@ dolog(sin) sizeof(struct in_addr), AF_INET); if (hp) - (void) strncpy(remotehost, hp->h_name, sizeof(remotehost)); + (void) strncpy(remotehost, hp->h_name, sizeof(remotehost)-1); else (void) strncpy(remotehost, inet_ntoa(sin->sin_addr), - sizeof(remotehost)); + sizeof(remotehost)-1); + remotehost[sizeof(remotehost)-1] = '\0'; #ifdef HASSETPROCTITLE snprintf(proctitle, sizeof(proctitle), "%s: connected", remotehost); setproctitle(proctitle); @@ -1796,7 +1799,7 @@ gunique(local) { static char new[MAXPATHLEN]; struct stat st; - int count; + int count, len; char *cp; cp = strrchr(local, '/'); @@ -1808,8 +1811,12 @@ gunique(local) } if (cp) *cp = '/'; - (void) strncpy(new, local, sizeof(new)); - cp = new + strlen(new); + (void) strncpy(new, local, sizeof(new)-1); + new[sizeof(new)-1] = '\0'; + len = strlen(new); + if (len+2+1 >= sizeof(new)-1) + return (NULL); + cp = new + len; *cp++ = '.'; for (count = 1; count < 100; count++) { (void)snprintf(cp, sizeof(new) - (cp - new), "%d", count); |