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:54:35 -0500 |
| commit | cc0a813f23136fb1f1aff8bf4cdc831ae3d360d4 (patch) | |
| tree | 745d50d75177ea4f8db8736c2e1eb01ba3c565e8 /crypto/pkcs12 | |
| parent | ded9d1076cffc912ed7c40256b6202876a2b6caa (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index d6b891920c..899a12e134 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) { |