summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-04-16 14:06:56 +0100
committerMatt Caswell <matt@openssl.org>2018-04-17 17:02:33 +0100
commitbd7775e14a19c326d3720f2345c2ae324409e979 (patch)
tree5507c1203a1d8984d147c4c8a1a57c6a7629a07c /ssl
parent2bdeffefddd8e8a65a51a7b020f8d51a4a3b1602 (diff)
Fix assertion failure in SSL_set_bio()
If SSL_set_bio() is called with a NULL wbio after a failed connection then this can trigger an assertion failure. This should be valid behaviour and the assertion is in fact invalid and can simply be removed. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5966)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_lib.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b1d78dc35e..1e24f8446d 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3844,8 +3844,6 @@ int ssl_free_wbio_buffer(SSL *s)
return 1;
s->wbio = BIO_pop(s->wbio);
- if (!ossl_assert(s->wbio != NULL))
- return 0;
BIO_free(s->bbio);
s->bbio = NULL;