upstream: scp: when copying local->remote, check that source file

exists before opening SFTP connection to the server. Based on GHPR#370 ok
dtucker, markus

OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb

diff --git a/scp.c b/scp.c
index a893d4a285e95024dcd41c70bc09c6ce625cd3ba..470b4f466e0d7393a8991df3c54833dfcba3a645 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.253 2023/03/03 03:12:24 dtucker Exp $ */
+/* $OpenBSD: scp.c,v 1.254 2023/03/27 03:25:08 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1036,6 +1036,7 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
        struct sftp_conn *conn = NULL, *conn2 = NULL;
        arglist alist;
        int i, r, status;
+       struct stat sb;
        u_int j;
 
        memset(&alist, '\0', sizeof(alist));
@@ -1178,6 +1179,11 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
                                errs = 1;
                } else {        /* local to remote */
                        if (mode == MODE_SFTP) {
+                               /* no need to glob: already done by shell */
+                               if (stat(argv[i], &sb) != 0) {
+                                       fatal("stat local \"%s\": %s", argv[i],
+                                           strerror(errno));
+                               }
                                if (remin == -1) {
                                        /* Connect to remote now */
                                        conn = do_sftp_connect(thost, tuser,