From: David Ramos <daramos@stanford.edu>
Date: Sat, 3 May 2014 10:00:27 +0000 (+0200)
Subject: Double free in i2o_ECPublicKey
X-Git-Tag: master-post-reformat~842
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=16ba70746b3bd9d1bd17cf7135c00ff1e47dfcfe;p=oweals%2Fopenssl.git

Double free in i2o_ECPublicKey

PR: 3338
---

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 145807b611..e94f34e11b 100644
--- a/crypto/ec/ec_asn1.c
+++ b/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)