nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix duplicated exit code in ppk_load_s.

Browse Source 
There's no need to have one bunch of free operations before returning
success and another version before returning error. Easier to just set
up the state in the former case so that we can fall through to the
latter.
This commit is contained in:
Simon Tatham 2021-02-20 16:39:12 +00:00
parent ce60ca727c
commit 29b8e26f7d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sshpubk.c
View File

@ -800,14 +800,13 @@ ssh2_userkey *ppk_load_s(BinarySource *src, const char *passphrase,
goto error; goto error;
} }
} }
sfree(mac);
mac = NULL;
/* /*
* Create and return the key. * Create and return the key.
*/ */
ret = snew(ssh2_userkey); ret = snew(ssh2_userkey);
ret->comment = comment; ret->comment = comment;
comment = NULL;
ret->key = ssh_key_new_priv( ret->key = ssh_key_new_priv(
alg, ptrlen_from_strbuf(public_blob), alg, ptrlen_from_strbuf(public_blob),
ptrlen_from_strbuf(private_blob)); ptrlen_from_strbuf(private_blob));
@ -817,12 +816,7 @@ ssh2_userkey *ppk_load_s(BinarySource *src, const char *passphrase,
error = "createkey failed"; error = "createkey failed";
goto error; goto error;
} }
strbuf_free(public_blob); error = NULL;
strbuf_free(private_blob);
sfree(encryption);
if (errorstr)
*errorstr = NULL;
return ret;
/* /*
* Error processing. * Error processing.