Correct pointer types in new clipme function

[u/mdw/putty] / scp.c

diff --git a/scp.c b/scp.c
index 0f20b25..3f85006 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -377,7 +377,7 @@ static void bump(char *fmt, ...)
     strcat(str, "\n");
     tell_str(stderr, str);
 
-    if (back->socket() != NULL) {
+    if (back != NULL && back->socket() != NULL) {
        char ch;
        back->special(TS_EOF);
        ssh_scp_recv(&ch, 1);
@@ -828,12 +828,6 @@ static void sink(char *targ, char *src)
        if (sscanf(buf+1, "%u %lu %[^\n]", &mode, &size, namebuf) != 3)
            bump("Protocol error: Illegal file descriptor format");
        /* Security fix: ensure the file ends up where we asked for it. */
-       if (src) {
-           char *p = src + strlen(src);
-           while (p > src && p[-1] != '/' && p[-1] != '\\')
-               p--;
-           strcpy(namebuf, p);
-       }
        if (targisdir) {
            char t[2048];
            char *p;
@@ -1215,6 +1209,7 @@ int main(int argc, char *argv[])
     }
     argc -= i;
     argv += i;
+    back = NULL;
 
     if (list) {
        if (argc != 1)
@@ -1234,7 +1229,7 @@ int main(int argc, char *argv[])
            tolocal(argc, argv);
     }
 
-    if (back->socket() != NULL) {
+    if (back != NULL && back->socket() != NULL) {
        char ch;
        back->special(TS_EOF);
        ssh_scp_recv(&ch, 1);