From c80cb8a59eea6e7961fa8b2da1fa30572b67aa18 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Thu, 3 Jul 2014 21:21:11 +0000
Subject: Memory-leak-in-error-path of the day in X509_ATTRIBUTE_set1_data().
 ok logan@ beck@

---
 src/lib/libcrypto/x509/x509_att.c         | 5 +++--
 src/lib/libssl/src/crypto/x509/x509_att.c | 5 +++--
 2 files changed, 6 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 bbbeba50ac..241464d999 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.9 2014/06/28 18:25:24 logan Exp $ */
+/* $OpenBSD: x509_att.c,v 1.10 2014/07/03 21:21:11 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -304,7 +304,7 @@ int
 X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
     int len)
 {
-	ASN1_TYPE *ttmp;
+	ASN1_TYPE *ttmp = NULL;
 	ASN1_STRING *stmp = NULL;
 	int atype = 0;
 
@@ -350,6 +350,7 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 	return 1;
 
 err:
+	ASN1_TYPE_free(ttmp);
 	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 bbbeba50ac..241464d999 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.9 2014/06/28 18:25:24 logan Exp $ */
+/* $OpenBSD: x509_att.c,v 1.10 2014/07/03 21:21:11 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -304,7 +304,7 @@ int
 X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
     int len)
 {
-	ASN1_TYPE *ttmp;
+	ASN1_TYPE *ttmp = NULL;
 	ASN1_STRING *stmp = NULL;
 	int atype = 0;
 
@@ -350,6 +350,7 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 	return 1;
 
 err:
+	ASN1_TYPE_free(ttmp);
 	ASN1_STRING_free(stmp);
 	X509err(X509_F_X509_ATTRIBUTE_SET1_DATA, ERR_R_MALLOC_FAILURE);
 	return 0;
-- 
cgit v1.2.3-55-g6feb