From: tedu <tedu@openbsd.org>
Date: Wed, 7 May 2014 21:18:53 +0000 (+0000)
Subject: don't free memory unless we allocated it.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d41aaf0b54950261cb35173542b8eb0e1a2c35a2;p=openbsd

don't free memory unless we allocated it.
reported to openssl by David Ramos (rt 3338)
stealing commit from logan, who's run away. ok miod.
---

diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c
index 70670a4c750..0ea0d6e2a43 100644
--- a/lib/libcrypto/ec/ec_asn1.c
+++ b/lib/libcrypto/ec/ec_asn1.c
@@ -1233,8 +1233,10 @@ i2o_ECPublicKey(EC_KEY * a, unsigned char **out)
 	if (!EC_POINT_point2oct(a->group, a->pub_key, a->conv_form,
 		*out, buf_len, NULL)) {
 		ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB);
-		free(*out);
-		*out = NULL;
+		if (new_buffer) {
+			free(*out);
+			*out = NULL;
+		}
 		return 0;
 	}
 	if (!new_buffer)
diff --git a/lib/libssl/src/crypto/ec/ec_asn1.c b/lib/libssl/src/crypto/ec/ec_asn1.c
index 70670a4c750..0ea0d6e2a43 100644
--- a/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1233,8 +1233,10 @@ i2o_ECPublicKey(EC_KEY * a, unsigned char **out)
 	if (!EC_POINT_point2oct(a->group, a->pub_key, a->conv_form,
 		*out, buf_len, NULL)) {
 		ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB);
-		free(*out);
-		*out = NULL;
+		if (new_buffer) {
+			free(*out);
+			*out = NULL;
+		}
 		return 0;
 	}
 	if (!new_buffer)