]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
release allocated memory on a cipher or mac failure to initialize.
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Tue, 8 Nov 2011 21:02:30 +0000 (22:02 +0100)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Wed, 9 Nov 2011 07:49:12 +0000 (08:49 +0100)
lib/nettle/cipher.c
lib/nettle/mac.c

index 014a54924cfedc5ad1f8b1639aaf3df63ebef698..83da47379ab014d3fecc6d40aaae90cd3afd45d4 100644 (file)
@@ -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;
     }
 
index a0f4ea56a7e7eb7fe1ee07dc3197abe1640f0756..4a77895a27f8c1ee95cf20cd0f01220089f87213 100644 (file)
@@ -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;
     }