From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 22 Oct 2006 20:19:55 +0000 (+0000)
Subject: Spotted by Tim Kosse: we were returning an incorrect path in canonify() when
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/commitdiff_plain/e25883f80bdfce0a1020fc473563302679801f06?hp=bf98289914f47f394aa0cc442c267e56490c9e70

Spotted by Tim Kosse: we were returning an incorrect path in canonify() when
we couldn't get any sense out of the server.


git-svn-id: svn://svn.tartarus.org/sgt/putty@6877 cda61777-01e9-0310-a592-d414129be87e
---

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