diff options
| author |   markus <markus@openbsd.org> | 2001-03-16 13:44:24 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2001-03-16 13:44:24 +0000 |
| commit | d0bda200fca177438675e1afe2a0722ac66d17eb (patch) | |
| tree | 2eda28b23f3cb882dafd6ae6201b235c8551edae | |
| parent | drop packets with link-local addresses, (diff) | |
| download | wireguard-openbsd-d0bda200fca177438675e1afe2a0722ac66d17eb.tar.xz wireguard-openbsd-d0bda200fca177438675e1afe2a0722ac66d17eb.zip | |
discourage strcat/strcpy
| -rw-r--r-- | usr.bin/ssh/sftp-int.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/ssh/sftp-int.c b/usr.bin/ssh/sftp-int.c index 0c8bdd88042..6240bf96a0b 100644 --- a/usr.bin/ssh/sftp-int.c +++ b/usr.bin/ssh/sftp-int.c @@ -26,7 +26,7 @@ /* XXX: recursive operations */ #include "includes.h" -RCSID("$OpenBSD: sftp-int.c,v 1.30 2001/03/16 09:55:53 markus Exp $"); +RCSID("$OpenBSD: sftp-int.c,v 1.31 2001/03/16 13:44:24 markus Exp $"); #include <glob.h> @@ -200,11 +200,12 @@ char * path_append(char *p1, char *p2) { char *ret; + int len = strlen(p1) + strlen(p2) + 2; - ret = xmalloc(strlen(p1) + strlen(p2) + 2); - strcpy(ret, p1); - strcat(ret, "/"); - strcat(ret, p2); + ret = xmalloc(len); + strlcpy(ret, p1, len); + strlcat(ret, "/", len); + strlcat(ret, p2, len); return(ret); } |