X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/bf98289914f47f394aa0cc442c267e56490c9e70..e25883f80bdfce0a1020fc473563302679801f06:/psftp.c

diff --git a/psftp.c b/psftp.c
index d07ee8b0..f77a88ed 100644
--- a/psftp.c
+++ b/psftp.c
@@ -128,8 +128,12 @@ char *canonify(char *name)
 	assert(rreq == req);
 	canonname = fxp_realpath_recv(pktin, rreq);
 
-	if (!canonname)
-	    return fullname;	       /* even that failed; give up */
+	if (!canonname) {
+	    /* Even that failed. Restore our best guess at the
+	     * constructed filename and give up */
+	    fullname[i] = '/';	/* restore slash and last component */
+	    return fullname;
+	}
 
 	/*
 	 * We have a canonical name for all but the last path