X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/a285f830b66416a81f4c612345db46663509e7e8..4c26bb506b3c12443171551b103a81b038d25334:/settings.c

diff --git a/settings.c b/settings.c
index 52538f62..9985e2d1 100644
--- a/settings.c
+++ b/settings.c
@@ -84,9 +84,13 @@ int get_remote_username(Config *cfg, char *user, size_t len)
 	if (cfg->username_from_env) {
 	    /* Use local username. */
 	    char *luser = get_username();
-	    strncpy(user, luser, len);
-	    user[len-1] = '\0';
-	    sfree(luser);
+	    if (luser) {
+		strncpy(user, luser, len);
+		user[len-1] = '\0';
+		sfree(luser);
+	    } else {
+		*user = '\0';
+	    }
 	} else {
 	    *user = '\0';
 	}