diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-10 07:46:24 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-10 09:23:45 +0100 |
| commit | f18c09c68108873abb7881c96068b2449a548290 (patch) | |
| tree | bbbfbc6f8e43cab638023555dc777a1b8997b243 | |
| parent | 5c7db52d2471d13d6c8e6c2e763d3ba2560d6cad (diff) | |
| download | gnutls-f18c09c68108873abb7881c96068b2449a548290.tar.gz | |
pkcs12: cleanups, and two memory leak fixes
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | lib/x509/pkcs12.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c index 414f9aa3d3..1f5b4bdf88 100644 --- a/lib/x509/pkcs12.c +++ b/lib/x509/pkcs12.c @@ -446,16 +446,17 @@ _pkcs12_decode_safe_contents(const gnutls_datum_t * content, || bag_type == GNUTLS_BAG_CRL || bag_type == GNUTLS_BAG_SECRET) { gnutls_datum_t tmp = bag->element[i].data; + bag->element[i].data.data = NULL; + bag->element[i].data.size = 0; result = _pkcs12_decode_crt_bag(bag_type, &tmp, &bag->element[i].data); + _gnutls_free_datum(&tmp); if (result < 0) { gnutls_assert(); goto cleanup; } - - _gnutls_free_datum(&tmp); } /* read the bag attributes @@ -1212,12 +1213,8 @@ pkcs12_try_gost: goto cleanup; } - _gnutls_free_datum(&tmp); - _gnutls_free_datum(&salt); - - return 0; - - cleanup: + result = 0; + cleanup: _gnutls_free_datum(&tmp); _gnutls_free_datum(&salt); return result; @@ -2024,12 +2021,13 @@ gnutls_pkcs12_mac_info(gnutls_pkcs12_t pkcs12, unsigned int *mac, memcpy(salt, dsalt.data, dsalt.size); } else { *salt_size = dsalt.size; - return gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER); + ret = gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER); + goto cleanup; } } ret = 0; - cleanup: + cleanup: _gnutls_free_datum(&tmp); _gnutls_free_datum(&dsalt); return ret; |