diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-17 00:37:31 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-17 00:37:31 +0000 |
commit | cf00df63443b40190d3f88c5f0a7e102540d0cac (patch) | |
tree | 2ac33f2738bad5268dbd12a084e2a3a9945704c4 | |
parent | 5df2ffaeacd5a88b144740279e310e9c373bd8df (diff) |
- markus@cvs.openbsd.org 2001/03/16 13:44:24
[sftp-int.c]
discourage strcat/strcpy
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-int.c | 11 |
2 files changed, 10 insertions, 6 deletions
@@ -15,6 +15,9 @@ - markus@cvs.openbsd.org 2001/03/16 09:55:53 [sftp-int.c] fix memset and whitespace + - markus@cvs.openbsd.org 2001/03/16 13:44:24 + [sftp-int.c] + discourage strcat/strcpy 20010315 - OpenBSD CVS Sync @@ -4577,4 +4580,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.965 2001/03/17 00:36:17 mouring Exp $ +$Id: ChangeLog,v 1.966 2001/03/17 00:37:31 mouring Exp $ @@ -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 "buffer.h" #include "xmalloc.h" @@ -198,11 +198,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); } |