From de3895d580cd9748d48f414a81f740451b34e850 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sat, 6 Apr 2002 18:29:59 +0000 Subject: - mouring@cvs.openbsd.org 2002/04/06 18:24:09 [scp.c] Fixes potental double // within path. http://bugzilla.mindrot.org/show_bug.cgi?id=76 --- ChangeLog | 6 +++++- scp.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8264489bc..cfb3005d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ [sftp-client.c] Fix occasional corruption on upload due to bad reuse of request id, spotted by chombier@mac.com; ok markus@ + - mouring@cvs.openbsd.org 2002/04/06 18:24:09 + [scp.c] + Fixes potental double // within path. + http://bugzilla.mindrot.org/show_bug.cgi?id=76 - (bal) Slight update to OpenSC support. Better version checking. patch by Juha Yrjölä @@ -8179,4 +8183,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2029 2002/04/06 18:19:38 mouring Exp $ +$Id: ChangeLog,v 1.2030 2002/04/06 18:29:59 mouring Exp $ diff --git a/scp.c b/scp.c index fcf55abde..1fab48385 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.87 2002/03/30 17:45:46 deraadt Exp $"); +RCSID("$OpenBSD: scp.c,v 1.88 2002/04/06 18:24:09 mouring Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -774,7 +774,7 @@ sink(argc, argv) cursize = need; } (void) snprintf(namebuf, need, "%s%s%s", targ, - *targ ? "/" : "", cp); + strcmp(targ, "/") ? "/" : "", cp); np = namebuf; } else np = targ; -- cgit v1.2.3