diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2017-02-18 20:43:01 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-21 14:47:18 -0500 |
| commit | 1b8f19379a521ec11ce37e12316dd3edc0acfb82 (patch) | |
| tree | 83347372896f1dab4a4e8db68ab5cd7cef334b25 /crypto/pkcs12 | |
| parent | 0fbaef9e64fa10446aff805791befaa2b967e322 (diff) | |
| download | openssl-1b8f19379a521ec11ce37e12316dd3edc0acfb82.zip openssl-1b8f19379a521ec11ce37e12316dd3edc0acfb82.tar.gz openssl-1b8f19379a521ec11ce37e12316dd3edc0acfb82.tar.bz2 | |
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)
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index d6b8919..899a12e 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -204,6 +204,9 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, { X509_ALGOR *macalg; + PKCS12_MAC_DATA_free(p12->mac); + p12->mac = NULL; + if ((p12->mac = PKCS12_MAC_DATA_new()) == NULL) return PKCS12_ERROR; if (iter > 1) { |