From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 8 Nov 2011 21:02:30 +0000 (+0100)
Subject: release allocated memory on a cipher or mac failure to initialize.
X-Git-Tag: gnutls_3_0_8~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=395d620849722bd7fef44cb540a6bb435694d626;p=thirdparty%2Fgnutls.git

release allocated memory on a cipher or mac failure to initialize.
---

diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 014a54924c..83da47379a 100644
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -182,6 +182,7 @@ wrap_nettle_cipher_init (gnutls_cipher_algorithm_t algo, void **_ctx, int enc)
       break;
     default:
       gnutls_assert ();
+      gnutls_free(ctx);
       return GNUTLS_E_INVALID_REQUEST;
     }
 
diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index a0f4ea56a7..4a77895a27 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -177,7 +177,10 @@ wrap_nettle_hmac_init (gnutls_mac_algorithm_t algo, void **_ctx)
 
   ret = _hmac_ctx_init(algo, ctx);
   if (ret < 0)
-    return gnutls_assert_val(ret);
+    {
+      gnutls_free(ctx);
+      return gnutls_assert_val(ret);
+    }
 
   *_ctx = ctx;
 
@@ -372,6 +375,7 @@ wrap_nettle_hash_init (gnutls_digest_algorithm_t algo, void **_ctx)
   if ((ret=_ctx_init( algo, ctx)) < 0)
     {
       gnutls_assert ();
+      gnutls_free(ctx);
       return ret;
     }