diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2015-10-19 17:59:40 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2015-10-19 17:59:40 +0000 |
| commit | 0fd6c8662f5f990b93d166940679f3c145233581 (patch) | |
| tree | 415efcf0117e737d9162f479a905dfa5e182750e | |
| parent | d1635ec85d672c55616f25e107acf3e307a3ddd1 (diff) | |
free rbio before wbio
ok jsing@
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index 6479f729e7f..d37f305387c 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.114 2015/10/16 14:23:22 beck Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.115 2015/10/19 17:59:39 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -503,9 +503,9 @@ SSL_free(SSL *s) s->bbio = NULL; } - if (s->wbio != s->rbio) - BIO_free_all(s->wbio); - BIO_free_all(s->rbio); + if (s->rbio != s->wbio) + BIO_free_all(s->rbio); + BIO_free_all(s->wbio); if (s->init_buf != NULL) BUF_MEM_free(s->init_buf); @@ -572,10 +572,10 @@ SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio) } } - if ((s->wbio != wbio) && (s->rbio != s->wbio)) - BIO_free_all(s->wbio); - if (s->rbio != rbio) + if (s->rbio != rbio && s->rbio != s->wbio) BIO_free_all(s->rbio); + if (s->wbio != wbio) + BIO_free_all(s->wbio); s->rbio = rbio; s->wbio = wbio; } |