From dcea8db6b221ab812c66bfabd3c0a00aada78c96 Mon Sep 17 00:00:00 2001 From: Mark Riordan Date: Wed, 18 May 2011 16:18:39 -0500 Subject: Fix memory leak when compression is used Signed-off-by: Mark Riordan Signed-off-by: Andreas Schneider --- src/wrapper.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/wrapper.c b/src/wrapper.c index 6b88e0d..11482f8 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -38,6 +38,10 @@ #include #include +#ifdef WITH_LIBZ +#include +#endif + #include "libssh/priv.h" #include "libssh/session.h" #include "libssh/crypto.h" @@ -82,7 +86,7 @@ static void cipher_free(struct crypto_struct *cipher) { } struct ssh_crypto_struct *crypto_new(void) { - struct ssh_crypto_struct *crypto; + struct ssh_crypto_struct *crypto; crypto = malloc(sizeof(struct ssh_crypto_struct)); if (crypto == NULL) { @@ -108,6 +112,18 @@ void crypto_free(struct ssh_crypto_struct *crypto){ bignum_free(crypto->y); bignum_free(crypto->k); /* lot of other things */ + +#ifdef WITH_LIBZ + if (crypto->compress_out_ctx && + (deflateEnd(crypto->compress_out_ctx) != 0)) { + inflateEnd(crypto->compress_out_ctx); + } + if (crypto->compress_in_ctx && + (deflateEnd(crypto->compress_in_ctx) != 0)) { + inflateEnd(crypto->compress_in_ctx); + } +#endif + /* i'm lost in my own code. good work */ memset(crypto,0,sizeof(*crypto)); -- cgit