From 9c105697aa791bb1154f5737fbe2349e602bb5b7 Mon Sep 17 00:00:00 2001
From: logan <>
Date: Sat, 28 Jun 2014 18:25:24 +0000
Subject: Fix a memory leak and another one that occurs in the error paths.

(Thanks to Brent Cook)


OK from tedu@
---
 src/lib/libcrypto/x509/x509_att.c         | 8 ++++++--
 src/lib/libssl/src/crypto/x509/x509_att.c | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index f2668d189d..bbbeba50ac 100644
--- a/src/lib/libcrypto/x509/x509_att.c
+++ b/src/lib/libcrypto/x509/x509_att.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_att.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: x509_att.c,v 1.9 2014/06/28 18:25:24 logan Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -333,8 +333,11 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 	 * at least one value but some types use and zero length SET and
 	 * require this.
 	 */
-	if (attrtype == 0)
+	if (attrtype == 0) {
+		ASN1_STRING_free(stmp);
 		return 1;
+	}
+
 	if (!(ttmp = ASN1_TYPE_new()))
 		goto err;
 	if ((len == -1) && !(attrtype & MBSTRING_FLAG)) {
@@ -347,6 +350,7 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 	return 1;
 
 err:
+	ASN1_STRING_free(stmp);
 	X509err(X509_F_X509_ATTRIBUTE_SET1_DATA, ERR_R_MALLOC_FAILURE);
 	return 0;
 }
diff --git a/src/lib/libssl/src/crypto/x509/x509_att.c b/src/lib/libssl/src/crypto/x509/x509_att.c
index f2668d189d..bbbeba50ac 100644
--- a/src/lib/libssl/src/crypto/x509/x509_att.c
+++ b/src/lib/libssl/src/crypto/x509/x509_att.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_att.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: x509_att.c,v 1.9 2014/06/28 18:25:24 logan Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -333,8 +333,11 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 	 * at least one value but some types use and zero length SET and
 	 * require this.
 	 */
-	if (attrtype == 0)
+	if (attrtype == 0) {
+		ASN1_STRING_free(stmp);
 		return 1;
+	}
+
 	if (!(ttmp = ASN1_TYPE_new()))
 		goto err;
 	if ((len == -1) && !(attrtype & MBSTRING_FLAG)) {
@@ -347,6 +350,7 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 	return 1;
 
 err:
+	ASN1_STRING_free(stmp);
 	X509err(X509_F_X509_ATTRIBUTE_SET1_DATA, ERR_R_MALLOC_FAILURE);
 	return 0;
 }
-- 
cgit v1.2.3-55-g6feb