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

Memory management fixes. Fixed a segfault in SSH1 compression

Browse Source 
cleanup noticed by Gerhard Wiesinger, and also fixed some memory
leaks spotted by valgrind while debugging same.

[originally from svn r3726]
This commit is contained in:
Simon Tatham 2004-01-18 09:14:41 +00:00
parent 5a11f18569
commit 33a59e78f1
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssh.c
View File

@ -2767,6 +2767,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt)
if (s->authed) if (s->authed)
break; break;
} }
sfree(s->response);
} }
if (s->authed) if (s->authed)
break; break;
@ -4922,6 +4923,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
if (s->authed) if (s->authed)
continue; continue;
} }
sfree(s->response);
} }
if (!s->method && s->can_pubkey && s->publickey_blob if (!s->method && s->can_pubkey && s->publickey_blob
@ -6264,10 +6266,18 @@ static void ssh_free(void *handle)
ssh->csmac->free_context(ssh->cs_mac_ctx); ssh->csmac->free_context(ssh->cs_mac_ctx);
if (ssh->sc_mac_ctx) if (ssh->sc_mac_ctx)
ssh->scmac->free_context(ssh->sc_mac_ctx); ssh->scmac->free_context(ssh->sc_mac_ctx);
if (ssh->cs_comp_ctx) if (ssh->cs_comp_ctx) {
ssh->cscomp->compress_cleanup(ssh->cs_comp_ctx); if (ssh->cscomp)
if (ssh->sc_comp_ctx) ssh->cscomp->compress_cleanup(ssh->cs_comp_ctx);
ssh->sccomp->compress_cleanup(ssh->sc_comp_ctx); else
zlib_compress_cleanup(ssh->cs_comp_ctx);
}
if (ssh->sc_comp_ctx) {
if (ssh->sccomp)
ssh->sccomp->decompress_cleanup(ssh->sc_comp_ctx);
else
zlib_decompress_cleanup(ssh->sc_comp_ctx);
}
if (ssh->kex_ctx) if (ssh->kex_ctx)
dh_cleanup(ssh->kex_ctx); dh_cleanup(ssh->kex_ctx);
sfree(ssh->savedhost); sfree(ssh->savedhost);

6
sshzlib.c
View File

@ -602,6 +602,8 @@ void zlib_compress_cleanup(void *handle)
{ {
struct LZ77Context *ectx = (struct LZ77Context *)handle; struct LZ77Context *ectx = (struct LZ77Context *)handle;
sfree(ectx->userdata); sfree(ectx->userdata);
sfree(ectx->ictx);
sfree(ectx);
} }
/* /*
@ -963,13 +965,15 @@ void *zlib_decompress_init(void)
void zlib_decompress_cleanup(void *handle) void zlib_decompress_cleanup(void *handle)
{ {
struct zlib_decompress_ctx *dctx = (struct zlib_decompress_ctx *)handle; struct zlib_decompress_ctx *dctx = (struct zlib_decompress_ctx *)handle;
if (dctx->currlentable && dctx->currlentable != dctx->staticlentable) if (dctx->currlentable && dctx->currlentable != dctx->staticlentable)
zlib_freetable(&dctx->currlentable); zlib_freetable(&dctx->currlentable);
if (dctx->currdisttable && dctx->currdisttable != dctx->staticdisttable) if (dctx->currdisttable && dctx->currdisttable != dctx->staticdisttable)
zlib_freetable(&dctx->currdisttable); zlib_freetable(&dctx->currdisttable);
if (dctx->lenlentable) if (dctx->lenlentable)
zlib_freetable(&dctx->lenlentable); zlib_freetable(&dctx->lenlentable);
zlib_freetable(&dctx->staticlentable);
zlib_freetable(&dctx->staticdisttable);
sfree(dctx); sfree(dctx);
} }