1 files changed, 8 insertions, 5 deletions

diff --git a/scp.c b/scp.c
index f69fd05fc..dcea1946b 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.119 2005/01/24 10:22:06 dtucker Exp $");
+RCSID("$OpenBSD: scp.c,v 1.120 2005/03/31 18:39:21 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -361,20 +361,23 @@ void
 toremote(char *targ, int argc, char **argv)
 {
         int i, len;
-        char *bp, *host, *src, *suser, *thost, *tuser;
+        char *bp, *host, *src, *suser, *thost, *tuser, *arg;
 
         *targ++ = 0;
         if (*targ == 0)
                 targ = ".";
 
-        if ((thost = strrchr(argv[argc - 1], '@'))) {
+        arg = strdup(argv[argc - 1]);
+        if (!arg)
+                err(1, "malloc");
+        if ((thost = strrchr(arg, '@'))) {
                 /* user@host */
                 *thost++ = 0;
-                tuser = argv[argc - 1];
+                tuser = arg;
                 if (*tuser == '\0')
                         tuser = NULL;
         } else {
-                thost = argv[argc - 1];
+                thost = arg;
                 tuser = NULL;
         }