nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Another two mis-fixes from r9919: when we sfree(line) on exit from the

Browse Source 
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.

[originally from svn r9944]
[r9919 == ea301bdd9b892a5e70692f82f5c0b98bd585e775]
This commit is contained in:
Simon Tatham 2013-07-20 13:15:11 +00:00
parent 3af26af19e
commit 01ead8590b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
import.c
View File

@ -372,6 +372,7 @@ static struct openssh_key *load_openssh_key(const Filename *filename,
if (0 == strncmp(line, "-----END ", 9) && if (0 == strncmp(line, "-----END ", 9) &&
0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) { 0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) {
sfree(line); sfree(line);
line = NULL;
break; /* done */ break; /* done */
} }
if ((p = strchr(line, ':')) != NULL) { if ((p = strchr(line, ':')) != NULL) {
@ -1095,6 +1096,7 @@ static struct sshcom_key *load_sshcom_key(const Filename *filename,
strip_crlf(line); strip_crlf(line);
if (!strcmp(line, "---- END SSH2 ENCRYPTED PRIVATE KEY ----")) { if (!strcmp(line, "---- END SSH2 ENCRYPTED PRIVATE KEY ----")) {
sfree(line); sfree(line);
line = NULL;
break; /* done */ break; /* done */
} }
if ((p = strchr(line, ':')) != NULL) { if ((p = strchr(line, ':')) != NULL) {