From 95519954bb32998ee415d159b5b8ca1be9e0d827 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 26 Sep 2014 19:30:38 +0000
Subject: X509at_add1_attr(): do not free stuff we did not allocate in the
 error path. ok tedu@

---
 src/lib/libcrypto/x509/x509_att.c         | 6 +++---
 src/lib/libssl/src/crypto/x509/x509_att.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index 4ae7504cae..e3acc18ed1 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.11 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_att.c,v 1.12 2014/09/26 19:30:38 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr)
 		if ((sk = sk_X509_ATTRIBUTE_new_null()) == NULL)
 			goto err;
 	} else
-		sk= *x;
+		sk = *x;
 
 	if ((new_attr = X509_ATTRIBUTE_dup(attr)) == NULL)
 		goto err2;
@@ -155,7 +155,7 @@ err:
 err2:
 	if (new_attr != NULL)
 		X509_ATTRIBUTE_free(new_attr);
-	if (sk != NULL)
+	if (sk != NULL && sk != *x)
 		sk_X509_ATTRIBUTE_free(sk);
 	return (NULL);
 }
diff --git a/src/lib/libssl/src/crypto/x509/x509_att.c b/src/lib/libssl/src/crypto/x509/x509_att.c
index 4ae7504cae..e3acc18ed1 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.11 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_att.c,v 1.12 2014/09/26 19:30:38 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,7 +140,7 @@ X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr)
 		if ((sk = sk_X509_ATTRIBUTE_new_null()) == NULL)
 			goto err;
 	} else
-		sk= *x;
+		sk = *x;
 
 	if ((new_attr = X509_ATTRIBUTE_dup(attr)) == NULL)
 		goto err2;
@@ -155,7 +155,7 @@ err:
 err2:
 	if (new_attr != NULL)
 		X509_ATTRIBUTE_free(new_attr);
-	if (sk != NULL)
+	if (sk != NULL && sk != *x)
 		sk_X509_ATTRIBUTE_free(sk);
 	return (NULL);
 }
-- 
cgit v1.2.3-55-g6feb