diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2017-02-18 20:43:01 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-21 15:00:18 -0500 |
| commit | 13fc6b6650c43e58f23aa32cfcc9bf0ace8fb51e (patch) | |
| tree | 968f9219f48e8cfa54a4d27864593e6a25a10146 /crypto/pkcs12 | |
| parent | 342843884a68a480aaa8fa5c2767c3a9a2a38bf8 (diff) | |
Fix memory leak in pkcs12 -export
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2676)
(cherry picked from commit 1b8f19379a521ec11ce37e12316dd3edc0acfb82)
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index cbf34da05a..b1f7381a6f 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -159,7 +159,10 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, const EVP_MD *md_type) { - if (!(p12->mac = PKCS12_MAC_DATA_new())) + PKCS12_MAC_DATA_free(p12->mac); + p12->mac = NULL; + + if ((p12->mac = PKCS12_MAC_DATA_new()) == NULL) return PKCS12_ERROR; if (iter > 1) { if (!(p12->mac->iter = M_ASN1_INTEGER_new())) { |