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

Fix assorted memory leaks.

Browse Source 
Affects command-line PuTTYgen, PSFTP, and anything running the SSH-2
userauth client layer.

Tweaked version of a patch due to Tim Kosse.
This commit is contained in:
Simon Tatham 2019-07-06 17:44:15 +01:00
parent 11f504c440
commit e2a047ad8d
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmdgen.c
View File

@ -742,6 +742,9 @@ int main(int argc, char **argv)
assert(infile != NULL); assert(infile != NULL);
sfree(origcomment);
origcomment = NULL;
/* /*
* Find out whether the input key is encrypted. * Find out whether the input key is encrypted.
*/ */
@ -788,7 +791,11 @@ int main(int argc, char **argv)
strbuf *blob; strbuf *blob;
BinarySource src[1]; BinarySource src[1];
sfree(origcomment);
origcomment = NULL;
blob = strbuf_new(); blob = strbuf_new();
ret = rsa_ssh1_loadpub(infilename, BinarySink_UPCAST(blob), ret = rsa_ssh1_loadpub(infilename, BinarySink_UPCAST(blob),
&origcomment, &error); &origcomment, &error);
BinarySource_BARE_INIT(src, blob->u, blob->len); BinarySource_BARE_INIT(src, blob->u, blob->len);
@ -814,6 +821,8 @@ int main(int argc, char **argv)
case SSH_KEYTYPE_SSH2_PUBLIC_RFC4716: case SSH_KEYTYPE_SSH2_PUBLIC_RFC4716:
case SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH: case SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH:
if (!load_encrypted) { if (!load_encrypted) {
sfree(origcomment);
origcomment = NULL;
ssh2blob = strbuf_new(); ssh2blob = strbuf_new();
if (ssh2_userkey_loadpub(infilename, &ssh2alg, BinarySink_UPCAST(ssh2blob), if (ssh2_userkey_loadpub(infilename, &ssh2alg, BinarySink_UPCAST(ssh2blob),
&origcomment, &error)) { &origcomment, &error)) {
@ -1083,6 +1092,8 @@ int main(int argc, char **argv)
ssh_key_free(ssh2key->key); ssh_key_free(ssh2key->key);
sfree(ssh2key); sfree(ssh2key);
} }
if (ssh2blob)
strbuf_free(ssh2blob);
sfree(origcomment); sfree(origcomment);
if (infilename) if (infilename)
filename_free(infilename); filename_free(infilename);

12
psftp.c
View File

@ -33,6 +33,7 @@ static void do_sftp_cleanup(void);
*/ */
char *pwd, *homedir; char *pwd, *homedir;
static LogContext *psftp_logctx = NULL;
static Backend *backend; static Backend *backend;
Conf *conf; Conf *conf;
bool sent_eof = false; bool sent_eof = false;
@ -2576,7 +2577,6 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
{ {
char *host, *realhost; char *host, *realhost;
const char *err; const char *err;
LogContext *logctx;
/* Separate host and username */ /* Separate host and username */
host = userhost; host = userhost;
@ -2733,11 +2733,11 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
"exec sftp-server"); "exec sftp-server");
conf_set_bool(conf, CONF_ssh_subsys2, false); conf_set_bool(conf, CONF_ssh_subsys2, false);
logctx = log_init(default_logpolicy, conf); psftp_logctx = log_init(default_logpolicy, conf);
platform_psftp_pre_conn_setup(); platform_psftp_pre_conn_setup();
err = backend_init(&ssh_backend, psftp_seat, &backend, logctx, conf, err = backend_init(&ssh_backend, psftp_seat, &backend, psftp_logctx, conf,
conf_get_str(conf, CONF_host), conf_get_str(conf, CONF_host),
conf_get_int(conf, CONF_port), conf_get_int(conf, CONF_port),
&realhost, 0, &realhost, 0,
@ -2906,5 +2906,11 @@ int psftp_main(int argc, char *argv[])
cmdline_cleanup(); cmdline_cleanup();
sk_cleanup(); sk_cleanup();
stripctrl_free(string_scc);
stripctrl_free(stderr_scc);
if (psftp_logctx)
log_free(psftp_logctx);
return ret; return ret;
} }

4
ssh2userauth.c
View File

@ -178,6 +178,10 @@ static void ssh2_userauth_free(PacketProtocolLayer *ppl)
sfree(s->default_username); sfree(s->default_username);
sfree(s->hostname); sfree(s->hostname);
sfree(s->fullhostname); sfree(s->fullhostname);
sfree(s->publickey_comment);
sfree(s->publickey_algorithm);
if (s->publickey_blob)
strbuf_free(s->publickey_blob);
strbuf_free(s->last_methods_string); strbuf_free(s->last_methods_string);
if (s->banner_scc) if (s->banner_scc)
stripctrl_free(s->banner_scc); stripctrl_free(s->banner_scc);