From 6b10601e1e787194a445062733084548302d8eb4 Mon Sep 17 00:00:00 2001
From: mmcc <>
Date: Sun, 27 Mar 2016 00:55:38 +0000
Subject: Merge a memleak fix from BoringSSL 6b6e0b2:

https://boringssl.googlesource.com/boringssl/+/6b6e0b20893e2be0e68af605a60ffa2cbb0ffa64%5E!/#F0

ok millert@, beck@
---
 src/lib/libssl/s3_clnt.c         | 4 +++-
 src/lib/libssl/src/ssl/s3_clnt.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index af3ba50072..264cb012d5 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.137 2016/03/11 07:08:45 mmcc Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.138 2016/03/27 00:55:38 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1641,6 +1641,7 @@ ssl3_get_certificate_request(SSL *s)
 			    ERR_R_MALLOC_FAILURE);
 			goto err;
 		}
+		xn = NULL;	/* avoid free in err block */
 	}
 
 	/* we should setup a certificate to return.... */
@@ -1658,6 +1659,7 @@ truncated:
 		    SSL_R_BAD_PACKET_LENGTH);
 	}
 err:
+	X509_NAME_free(xn);
 	if (ca_sk != NULL)
 		sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
 	return (ret);
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index af3ba50072..264cb012d5 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.137 2016/03/11 07:08:45 mmcc Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.138 2016/03/27 00:55:38 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1641,6 +1641,7 @@ ssl3_get_certificate_request(SSL *s)
 			    ERR_R_MALLOC_FAILURE);
 			goto err;
 		}
+		xn = NULL;	/* avoid free in err block */
 	}
 
 	/* we should setup a certificate to return.... */
@@ -1658,6 +1659,7 @@ truncated:
 		    SSL_R_BAD_PACKET_LENGTH);
 	}
 err:
+	X509_NAME_free(xn);
 	if (ca_sk != NULL)
 		sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
 	return (ret);
-- 
cgit v1.2.3-55-g6feb