tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/03/16 13:44:24 

[sftp-int.c]
     discourage strcat/strcpy
This commit is contained in:
Ben Lindstrom 2001-03-17 00:37:31 +00:00
parent 5df2ffaeac
commit cf00df6344
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -15,6 +15,9 @@
- markus@cvs.openbsd.org 2001/03/16 09:55:53 - markus@cvs.openbsd.org 2001/03/16 09:55:53
[sftp-int.c] [sftp-int.c]
fix memset and whitespace fix memset and whitespace
- markus@cvs.openbsd.org 2001/03/16 13:44:24
[sftp-int.c]
discourage strcat/strcpy
20010315 20010315
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4577,4 +4580,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

11
sftp-int.c
View File

@ -26,7 +26,7 @@
/* XXX: recursive operations */ /* XXX: recursive operations */
#include "includes.h" #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 "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -198,11 +198,12 @@ char *
path_append(char *p1, char *p2) path_append(char *p1, char *p2)
{ {
char *ret; char *ret;
int len = strlen(p1) + strlen(p2) + 2;
ret = xmalloc(strlen(p1) + strlen(p2) + 2); ret = xmalloc(len);
strcpy(ret, p1); strlcpy(ret, p1, len);
strcat(ret, "/"); strlcat(ret, "/", len);
strcat(ret, p2); strlcat(ret, p2, len);
return(ret); return(ret);
} }