diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
| commit | 309e057bcfb01861779d20e3ce027661dcae0910 (patch) | |
| tree | 806791a3db00c226152a7ed55c647916c51c974b /crypto/openssl/crypto/ec/ec_asn1.c | |
| parent | 679c7dcca69d7c267e21eb3b50c5cfa2e1f53f35 (diff) | |
| download | FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.zip FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.tar.gz | |
MFC: r267256
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/openssl/crypto/ec/ec_asn1.c')
| -rw-r--r-- | crypto/openssl/crypto/ec/ec_asn1.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/openssl/crypto/ec/ec_asn1.c b/crypto/openssl/crypto/ec/ec_asn1.c index 145807b..e94f34e 100644 --- a/crypto/openssl/crypto/ec/ec_asn1.c +++ b/crypto/openssl/crypto/ec/ec_asn1.c @@ -1435,8 +1435,11 @@ int i2o_ECPublicKey(EC_KEY *a, unsigned char **out) *out, buf_len, NULL)) { ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB); - OPENSSL_free(*out); - *out = NULL; + if (new_buffer) + { + OPENSSL_free(*out); + *out = NULL; + } return 0; } if (!new_buffer) |
