From 4c08f343e4fe7b8136e2190f886a6947beab5591 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 21 Apr 2017 09:28:47 +0200 Subject: _gnutls_base64_decode: addressed memory leak in decoding Signed-off-by: Nikos Mavrogiannopoulos --- lib/x509_b64.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/x509_b64.c b/lib/x509_b64.c index 44e3b47a41..884f4da481 100644 --- a/lib/x509_b64.c +++ b/lib/x509_b64.c @@ -263,8 +263,10 @@ _gnutls_base64_decode(const uint8_t * data, size_t data_size, size = BASE64_DECODE_LENGTH(data_size); result->data = gnutls_malloc(size); - if (result->data == NULL) - return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + if (result->data == NULL) { + ret = gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + goto cleanup; + } ret = base64_decode_update(&ctx, &size, result->data, pdata.size, pdata.data); @@ -277,8 +279,10 @@ _gnutls_base64_decode(const uint8_t * data, size_t data_size, } ret = base64_decode_final(&ctx); - if (ret != 1) - return gnutls_assert_val(GNUTLS_E_PARSING_ERROR); + if (ret != 1) { + ret = gnutls_assert_val(GNUTLS_E_PARSING_ERROR); + goto cleanup; + } result->size = size; -- cgit v1.2.1