diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:30:53 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:30:53 +0000 |
commit | 95148e3de293052afa4cc7708bc1547c697903cc (patch) | |
tree | e57e64ddd5813b7e5ec6979b5aec0529eab77274 /sftp-int.c | |
parent | ae996bf7d1967c83a0e0d71e9e89fa9a27d839f9 (diff) |
- jakob@cvs.openbsd.org 2001/07/31 12:42:50
[sftp-int.c sftp-server.c]
avoid paths beginning with "//"; <vinschen@redhat.com>
ok markus@
Diffstat (limited to 'sftp-int.c')
-rw-r--r-- | sftp-int.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sftp-int.c b/sftp-int.c index 573fea1df..0851e63a2 100644 --- a/sftp-int.c +++ b/sftp-int.c | |||
@@ -26,7 +26,7 @@ | |||
26 | /* XXX: recursive operations */ | 26 | /* XXX: recursive operations */ |
27 | 27 | ||
28 | #include "includes.h" | 28 | #include "includes.h" |
29 | RCSID("$OpenBSD: sftp-int.c,v 1.38 2001/07/09 07:04:53 deraadt Exp $"); | 29 | RCSID("$OpenBSD: sftp-int.c,v 1.39 2001/07/31 12:42:50 jakob Exp $"); |
30 | 30 | ||
31 | #include "buffer.h" | 31 | #include "buffer.h" |
32 | #include "xmalloc.h" | 32 | #include "xmalloc.h" |
@@ -204,7 +204,8 @@ path_append(char *p1, char *p2) | |||
204 | 204 | ||
205 | ret = xmalloc(len); | 205 | ret = xmalloc(len); |
206 | strlcpy(ret, p1, len); | 206 | strlcpy(ret, p1, len); |
207 | strlcat(ret, "/", len); | 207 | if (strcmp(p1, "/") != 0) |
208 | strlcat(ret, "/", len); | ||
208 | strlcat(ret, p2, len); | 209 | strlcat(ret, p2, len); |
209 | 210 | ||
210 | return(ret); | 211 | return(ret); |