From ced689e12a5037c6aeca62e9eaebdc098bd9c14e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 19 Dec 2014 18:53:34 -0500 Subject: sm: Avoid double-free on iconv failure * sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid double-free of pwbuf. -- Observed by Joshua Rogers , who proposed a slightly different fix. Debian-Bug-Id: 773472 Added fix at a second place - wk. --- agent/minip12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agent/minip12.c b/agent/minip12.c index 247171773..0bcab5f95 100644 --- a/agent/minip12.c +++ b/agent/minip12.c @@ -2182,6 +2182,7 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen, " requested charset `%s': %s\n", charset, strerror (errno)); gcry_free (pwbuf); + pwbuf = NULL; goto failure; } @@ -2196,6 +2197,7 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen, " requested charset `%s': %s\n", charset, strerror (errno)); gcry_free (pwbuf); + pwbuf = NULL; jnlib_iconv_close (cd); goto failure; } -- cgit v1.2.3