Fix a memory leak in an error path.

From OpenSSL commit 5e5d53d341fd9a9b9cc0a58eb3690832ca7a511f.

ok guenther@, logan@

2 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index f01008ec43..e1d3f6bad7 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.13 2015/03/19 14:00:22 tedu Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.14 2015/03/20 03:02:51 doug Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -1235,6 +1235,8 @@ d2i_ECParameters(EC_KEY ** a, const unsigned char **in, long len)
 
         if (!d2i_ECPKParameters(&ret->group, in, len)) {
                 ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+                if (a == NULL || *a != ret)
+                        EC_KEY_free(ret);
                 return NULL;
         }
 
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c
index f01008ec43..e1d3f6bad7 100644
--- a/src/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.13 2015/03/19 14:00:22 tedu Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.14 2015/03/20 03:02:51 doug Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -1235,6 +1235,8 @@ d2i_ECParameters(EC_KEY ** a, const unsigned char **in, long len)
 
         if (!d2i_ECPKParameters(&ret->group, in, len)) {
                 ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+                if (a == NULL || *a != ret)
+                        EC_KEY_free(ret);
                 return NULL;
         }