diff options
| author |   mmcc <mmcc@openbsd.org> | 2016-03-27 00:55:38 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2016-03-27 00:55:38 +0000 |
| commit | f246de3d5a9dbcfc5347b6c4d7b7951a69c29ef2 (patch) | |
| tree | 2878296276e2b1d0e4b4791a3d8b19366eeb2171 /lib/libssl/src | |
| parent | actually remove unnecessary includes (diff) | |
| download | wireguard-openbsd-f246de3d5a9dbcfc5347b6c4d7b7951a69c29ef2.tar.xz wireguard-openbsd-f246de3d5a9dbcfc5347b6c4d7b7951a69c29ef2.zip | |
Merge a memleak fix from BoringSSL 6b6e0b2:
https://boringssl.googlesource.com/boringssl/+/6b6e0b20893e2be0e68af605a60ffa2cbb0ffa64%5E!/#F0
ok millert@, beck@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/s3_clnt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c index af3ba500723..264cb012d5a 100644 --- a/lib/libssl/src/ssl/s3_clnt.c +++ b/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); |