From 091f5c3e6dfe57ebde616bd69bdc1866949e19a4 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 28 Sep 2014 10:53:57 +0000
Subject: X509v3_add_ext(): do not free stuff we did not allocate in the error
 path. ok bcook@

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

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index a745e6f71b..3d3a96f59b 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_v3.c,v 1.10 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_v3.c,v 1.11 2014/09/28 10:53:57 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -185,7 +185,7 @@ err:
 err2:
 	if (new_ex != NULL)
 		X509_EXTENSION_free(new_ex);
-	if (sk != NULL)
+	if (sk != NULL && (x != NULL && sk != *x))
 		sk_X509_EXTENSION_free(sk);
 	return (NULL);
 }
diff --git a/src/lib/libssl/src/crypto/x509/x509_v3.c b/src/lib/libssl/src/crypto/x509/x509_v3.c
index a745e6f71b..3d3a96f59b 100644
--- a/src/lib/libssl/src/crypto/x509/x509_v3.c
+++ b/src/lib/libssl/src/crypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_v3.c,v 1.10 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_v3.c,v 1.11 2014/09/28 10:53:57 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -185,7 +185,7 @@ err:
 err2:
 	if (new_ex != NULL)
 		X509_EXTENSION_free(new_ex);
-	if (sk != NULL)
+	if (sk != NULL && (x != NULL && sk != *x))
 		sk_X509_EXTENSION_free(sk);
 	return (NULL);
 }
-- 
cgit v1.2.3-55-g6feb