Memory leak upon error; Coverity CID 78857

ok doug@ jsing@
CVy: Committing in .

2 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c
index f024039fdd..65916778aa 100644
--- a/src/lib/libcrypto/x509v3/v3_cpols.c
+++ b/src/lib/libcrypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_cpols.c,v 1.18 2015/02/10 11:22:22 jsing Exp $ */
+/* $OpenBSD: v3_cpols.c,v 1.19 2015/02/14 15:17:52 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -461,6 +461,9 @@ notice_section(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *unot, int ia5org)
                                 X509V3err(X509V3_F_NOTICE_SECTION,
                                     X509V3_R_INVALID_NUMBERS);
                                 X509V3_conf_err(cnf);
+                                if (nos != NULL)
+                                        sk_CONF_VALUE_pop_free(nos,
+                                            X509V3_conf_free);
                                 goto err;
                         }
                         ret = nref_nos(nref->noticenos, nos);
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_cpols.c b/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
index f024039fdd..65916778aa 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_cpols.c,v 1.18 2015/02/10 11:22:22 jsing Exp $ */
+/* $OpenBSD: v3_cpols.c,v 1.19 2015/02/14 15:17:52 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -461,6 +461,9 @@ notice_section(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *unot, int ia5org)
                                 X509V3err(X509V3_F_NOTICE_SECTION,
                                     X509V3_R_INVALID_NUMBERS);
                                 X509V3_conf_err(cnf);
+                                if (nos != NULL)
+                                        sk_CONF_VALUE_pop_free(nos,
+                                            X509V3_conf_free);
                                 goto err;
                         }
                         ret = nref_nos(nref->noticenos, nos);