From: simon Date: Sat, 20 Jul 2013 13:15:11 +0000 (+0000) Subject: Another two mis-fixes from r9919: when we sfree(line) on exit from the X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/fe2582735a7206a4e855955d521a58f41f235211 Another two mis-fixes from r9919: when we sfree(line) on exit from the ssh.com and OpenSSH key import loops, we should also null it out so that the cleanup path doesn't try to re-free the same pointer. git-svn-id: svn://svn.tartarus.org/sgt/putty@9944 cda61777-01e9-0310-a592-d414129be87e --- diff --git a/import.c b/import.c index 32a1ac5d..f6dc2809 100644 --- a/import.c +++ b/import.c @@ -372,6 +372,7 @@ static struct openssh_key *load_openssh_key(const Filename *filename, if (0 == strncmp(line, "-----END ", 9) && 0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) { sfree(line); + line = NULL; break; /* done */ } if ((p = strchr(line, ':')) != NULL) { @@ -1095,6 +1096,7 @@ static struct sshcom_key *load_sshcom_key(const Filename *filename, strip_crlf(line); if (!strcmp(line, "---- END SSH2 ENCRYPTED PRIVATE KEY ----")) { sfree(line); + line = NULL; break; /* done */ } if ((p = strchr(line, ':')) != NULL) {