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 failure handling when loading a PPK file.

Browse Source 
Coverity pointed out that I'd checked if the LoadedFile was NULL, set
an error message ... and then accidentally fallen through to the
success handler anyway.
This commit is contained in:
Simon Tatham 2021-04-09 18:25:55 +01:00
parent d53b3bcd22
commit ed1d64b48a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sshpubk.c
View File

@ -993,12 +993,14 @@ ssh2_userkey *ppk_load_f(const Filename *filename, const char *passphrase,
const char **errorstr)
{
LoadedFile *lf = lf_load_keyfile(filename, errorstr);
if (!lf)
ssh2_userkey *toret;
if (lf) {
toret = ppk_load_s(BinarySource_UPCAST(lf), passphrase, errorstr);
lf_free(lf);
} else {
toret = NULL;
*errorstr = "can't open file";
ssh2_userkey *toret = ppk_load_s(BinarySource_UPCAST(lf),
passphrase, errorstr);
lf_free(lf);
}
return toret;
}