diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-07-01 09:37:44 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-07-05 16:48:45 +0200 |
| commit | 95f966b7954adec468e1e86c3c57d03768990126 (patch) | |
| tree | aea85ccb07ee6e015791e1aeeb075f9bdc080be2 /crypto/asn1 | |
| parent | 787ce7eea82539531fe4d0f98da6bb3e93b1b832 (diff) | |
Fix a memleak in X509_PKEY_new.
Fixes #3349
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3819)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/x_pkey.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c index 2da23e4756..59f8553928 100644 --- a/crypto/asn1/x_pkey.c +++ b/crypto/asn1/x_pkey.c @@ -106,10 +106,14 @@ X509_PKEY *X509_PKEY_new(void) X509_PKEY *ret = NULL; ASN1_CTX c; - M_ASN1_New_Malloc(ret, X509_PKEY); + ret = OPENSSL_malloc(sizeof(X509_PKEY)); + if (ret == NULL) { + c.line = __LINE__; + goto err; + } ret->version = 0; - M_ASN1_New(ret->enc_algor, X509_ALGOR_new); - M_ASN1_New(ret->enc_pkey, M_ASN1_OCTET_STRING_new); + ret->enc_algor = X509_ALGOR_new(); + ret->enc_pkey = M_ASN1_OCTET_STRING_new(); ret->dec_pkey = NULL; ret->key_length = 0; ret->key_data = NULL; @@ -117,8 +121,15 @@ X509_PKEY *X509_PKEY_new(void) ret->cipher.cipher = NULL; memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); ret->references = 1; - return (ret); - M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW); + if (ret->enc_algor == NULL || ret->enc_pkey == NULL) { + c.line = __LINE__; + goto err; + } + return ret; +err: + X509_PKEY_free(ret); + ASN1_MAC_H_err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE, c.line); + return NULL; } void X509_PKEY_free(X509_PKEY *x) |