diff options
| author | Rob Percival <robpercival@google.com> | 2016-02-22 14:42:09 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-01 11:59:28 -0500 |
| commit | e9fd74ac96c27cbee33d4b91a2caa0017c304975 (patch) | |
| tree | 2e2a239652a5136a705d42cf8bbfea0b358b2480 | |
| parent | 8c6afbc55cc8e2d036c0af5adbaff82d8117c6b2 (diff) | |
Fixes potential double free and memory leak in ct_b64.c
Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/ct/ct_b64.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c index a257b8f0d5..1c7a1682cd 100644 --- a/crypto/ct/ct_b64.c +++ b/crypto/ct/ct_b64.c @@ -103,7 +103,6 @@ static int CT_base64_decode(const char *in, unsigned char **out) outlen = EVP_DecodeBlock(outbuf, (unsigned char *)in, inlen); if (outlen < 0) { - OPENSSL_free(outbuf); CTerr(CT_F_CT_BASE64_DECODE, CT_R_BASE64_DECODE_ERROR); goto err; } @@ -170,6 +169,8 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64, } if (o2i_SCT_signature(sct, (const unsigned char **)&dec, declen) <= 0) goto err; + OPENSSL_free(dec); + dec = NULL; SCT_set_timestamp(sct, timestamp); @@ -186,7 +187,8 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64, CTLOG *CTLOG_new_from_base64(const char *pkey_base64, const char *name) { - unsigned char *pkey_der; + unsigned char *pkey_der = NULL; + const unsigned char *p; int pkey_der_len; EVP_PKEY *pkey = NULL; CTLOG *log = NULL; @@ -197,7 +199,9 @@ CTLOG *CTLOG_new_from_base64(const char *pkey_base64, const char *name) return NULL; } - pkey = d2i_PUBKEY(NULL, (const unsigned char **)&pkey_der, pkey_der_len); + p = pkey_der; + pkey = d2i_PUBKEY(NULL, &p, pkey_der_len); + OPENSSL_free(pkey_der); if (pkey == NULL) { CTerr(CT_F_CTLOG_NEW_FROM_BASE64, CT_R_LOG_CONF_INVALID_KEY); return NULL; |