Discussion:
[PATCH] tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation
(too old to reply)
Martin Storsjö
2018-08-16 07:57:33 UTC
Permalink
This was a typo in 0671eb2346c, spotted by Chris Carroux.
---
libavformat/tls_openssl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index f0b325ae98..4a2fcfd771 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -112,7 +112,7 @@ static int print_tls_error(URLContext *h, int ret)
TLSContext *c = h->priv_data;
if (h->flags & AVIO_FLAG_NONBLOCK) {
int err = SSL_get_error(c->ssl, ret);
- if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_READ)
+ if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE)
return AVERROR(EAGAIN);
}
av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
--
2.15.2 (Apple Git-101.1)
Luca Barbato
2018-08-16 11:18:11 UTC
Permalink
Post by Martin Storsjö
This was a typo in 0671eb2346c, spotted by Chris Carroux.
---
libavformat/tls_openssl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index f0b325ae98..4a2fcfd771 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -112,7 +112,7 @@ static int print_tls_error(URLContext *h, int ret)
TLSContext *c = h->priv_data;
if (h->flags & AVIO_FLAG_NONBLOCK) {
int err = SSL_get_error(c->ssl, ret);
- if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_READ)
+ if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE)
return AVERROR(EAGAIN);
}
av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
Sure

Loading...