diff -up libgcrypt-1.6.1/cipher/primegen.c.leak libgcrypt-1.6.1/cipher/primegen.c
--- libgcrypt-1.6.1/cipher/primegen.c.leak	2014-02-28 15:06:24.394464790 +0100
+++ libgcrypt-1.6.1/cipher/primegen.c	2014-02-28 15:09:22.938591664 +0100
@@ -1204,10 +1204,7 @@ _gcry_prime_group_generator (gcry_mpi_t
                              gcry_mpi_t prime, gcry_mpi_t *factors,
                              gcry_mpi_t start_g)
 {
-  gcry_mpi_t tmp   = mpi_new (0);
-  gcry_mpi_t b     = mpi_new (0);
-  gcry_mpi_t pmin1 = mpi_new (0);
-  gcry_mpi_t g = start_g? mpi_copy (start_g) : mpi_set_ui (NULL, 3);
+  gcry_mpi_t tmp, b, pmin1, g;
   int first = 1;
   int i, n;
 
@@ -1220,6 +1217,11 @@ _gcry_prime_group_generator (gcry_mpi_t
   if (n < 2)
     return GPG_ERR_INV_ARG;
 
+  tmp = mpi_new (0);
+  b = mpi_new (0);
+  pmin1 = mpi_new (0);
+  g = start_g? mpi_copy (start_g) : mpi_set_ui (NULL, 3);
+
   /* Extra sanity check - usually disabled. */
 /*   mpi_set (tmp, factors[0]); */
 /*   for(i = 1; i < n; i++) */
diff -up libgcrypt-1.6.1/src/hmac256.c.leak libgcrypt-1.6.1/src/hmac256.c
--- libgcrypt-1.6.1/src/hmac256.c.leak	2013-12-16 18:44:32.000000000 +0100
+++ libgcrypt-1.6.1/src/hmac256.c	2014-02-28 15:06:24.394464790 +0100
@@ -427,7 +427,6 @@ _gcry_hmac256_finalize (hmac256_context_
       tmphd = _gcry_hmac256_new (NULL, 0);
       if (!tmphd)
         {
-          free (hd);
           return NULL;
         }
       _gcry_hmac256_update (tmphd, hd->opad, 64);